Merge pull request #14452 from eileenmcnaughton/payment_activity