Collision fixes inbound still more needed (sadface)
Merge branch 'master'