Merge pull request #13957 from mattwire/extract_assignpaymentfields