Merge pull request #17951 from eileenmcnaughton/export_im