Merge 2.x into GroupManager branch