Fixing collision bugs
Merge branch 'refs/heads/feature/collision' into develop