Merge usergroups patch in