Merge pull request #14765 from eileenmcnaughton/export_test