Merge pull request #20784 from eileenmcnaughton/pay_fix