Merge pull request #23476 from eileenmcnaughton/import_dupe_more