Merge pull request #23464 from eileenmcnaughton/import_on_dup