Merge pull request #15018 from eileenmcnaughton/metadata