Merge pull request #12579 from eileenmcnaughton/export_another