Merge pull request #17849 from mattwire/statichandlePaymentNotification