Merge "Do move options checks before the move"