Merge "Rename of Control Renderers to Visuals" into devel/master