Issue #5983: merge -x #8851
Issue #5983: merge -x #8804
Merge pull request #2375 from VisualSJ/Renderer

Issue #5983: merge -x code