few changes in collisions per review
Merge remote-tracking branch 'origin/master' into Playerclas