Merge "Debug renderer" into devel/master