Integrate Group Manager
(cherry picked from commit aea66c61aa97a41d989fb1240baecfac1b1bca3f)