Removed all stretch move related stuff
Merge branch 'master' into different_push