Implements #884
Implement #885
Merge pull request #886 from emmanuel-keller/1.5

Renderer improvements