Merge pull request #20008 from eileenmcnaughton/pay_fee