"Quick" collision fix

Added special cases to remove butter cut collisions.
Merge remote-tracking branch 'origin/Demo-3-Collision-Fix' into Bugfixing-Demo3