Issue #3616160: Simplify RenderController code

Closes #3616160

Merge request reports

Loading