Merge pull request #23666 from eileenmcnaughton/import_combo