Merge branch 'master' into No_movement_mode