Merge pull request #23218 from eileenmcnaughton/import_part