Merge pull request #23263 from eileenmcnaughton/import_wippier