Merge pull request #14365 from eileenmcnaughton/dedupe_move