Merge pull request #14953 from eileenmcnaughton/export_test