Merge pull request #16690 from kartik1000/Shift_Update_Membership