Add optimized drawing
Merge branch 'refs/heads/next'