Merge pull request #15232 from eileenmcnaughton/credit