Merge pull request #14914 from eileenmcnaughton/export_test