Fix collision short circuit thing bug
Merge branch 'dev'