Fixing order of events
Merge remote-tracking branch 'refs/remotes/origin/DrawingSpeedup' into dev-v3