Merge "Fix the comments in CombinedUpdateRenderController" into devel/master