Merge pull request #14897 from mattwire/membership_payment2