Merge pull request #15243 from eileenmcnaughton/export_wip