Merge pull request #12288 from eileenmcnaughton/export