Merge pull request #11547 from eileenmcnaughton/safe_money