Merge pull request #20866 from totten/master-pathmove