Merge pull request #17949 from eileenmcnaughton/export_im