Merge pull request #23798 from seamuslee001/fix_auto_renew_membership