Merge "Use User::groupHasPermission"