Merge "Fix some issues of GroupManager"