Merge pull request #15569 from eileenmcnaughton/pay_notice