[#1696] Only get active memberships
Merge branch '1696-groups-membership'
Merge remote-tracking branch 'upstream/master'