Merge "Fix wrong assumptions about ParallelMove."