Merge pull request #14819 from eileenmcnaughton/export_up