Merge pull request #23653 from eileenmcnaughton/import_going