Merge pull request #13126 from eileenmcnaughton/export_more