Merge pull request #23442 from eileenmcnaughton/import_data