Merge pull request #23536 from eileenmcnaughton/import_cust