Implement #891
Fix #892
Merge pull request #893 from emmanuel-keller/1.5

Renderer improvement