Revert "Merge branch 'master' into C1_Essam_user_join_public_group"

This reverts commit 97c675a758d42550004467b5dd50279b9fa580d0, reversing
changes made to 5d8c8e772d6131b6d82273b06dfd47aa50ddc4d1.