Merge pull request #20313 from eileenmcnaughton/mem_move2