More renderer optimizations
Merge pull request #5081 from ricardoquesada/renderer_optimizations

More renderer optimizations