Improved collisions and updates
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'