Merge pull request #15095 from eileenmcnaughton/export_metadata