Merge pull request #19692 from demeritcowboy/case-custom-money-5.35