[FEATURE] enable Grouping in Perso controller and GroupController

Change-Id: Ia08cacf1be5b938edb004293368b961337bd0b5b
Merge "[FEATURE] enable Grouping in Perso controller and GroupController"