Draw optimizations (90%)
Merge remote-tracking branch 'origin/Marcus'