Merge "Fixed error in GroupManager"