Merge pull request #1928 from abarth/move_to_up

Enforce that we get a final move to the pointer up location