Merge "Cleaning up RendererFactory API" into devel/master