Merge pull request #12178 from jitendrapurohit/membership-4