Merge pull request #15949 from eileenmcnaughton/export_ref