Upstream merge - remove movement limit