Importing @debussyman code adding group support to the primary repo
Merge branch 'group_membership_support'