Implement an experimental movement fix
Merge branch 'master' into lite