Merge pull request #12059 from eileenmcnaughton/record_payment