Merge "(Control Renderers) Change renderer type values to uppercase" into devel/master