[INTERNAL] fixing group event problems

Change-Id: I3c1abe0c512ff1432aee22a7000b0fbc62368979
Merge "[INTERNAL] fixing group event problems"