Groups changes for MIFOSX-1482
Merge pull request #1064 from gauravsaini03/MIFOSX-1482

Groups changes for MIFOSX-1482