Upstream update of gs.groups