Fixing false positive on control group
Merge remote-tracking branch 'refs/remotes/origin/DrawingSpeedup' into dev-v3