Merge pull request #13718 from eileenmcnaughton/payment_ref