Avoiding double draw() calls
Merge pull request #4081 from yurydelendik/doubledraw

Avoiding double draw() calls