Merge pull request #12596 from eileenmcnaughton/export_ref