Merge GroupManager into 2.x