Merge pull request #15540 from wmortada/unfreeze_membership_end_date