Merge pull request #19605 from eileenmcnaughton/money