Merge branch 'rework-camera-to-square-#184'
Merge branch 'master' into rework-camera-to-square-#184