Merge pull request #12798 from mattwire/membership_renewal_varrename