From fd2825edfaebd3b07b64e06acbb86677415368d7 Mon Sep 17 00:00:00 2001
From: Gero Posmyk-Leinemann <gero@gitpod.io>
Date: Thu, 13 Feb 2025 15:52:49 +0000
Subject: [PATCH 1/6] squashed (- oidc/newUser)

Tool: gitpod/catfood.gitpod.cloud
---
 components/dashboard/package.json             |    1 +
 .../src/components/forms/InputField.tsx       |    4 +-
 .../src/components/podkit/forms/TextArea.tsx  |   27 +
 .../update-org-settings-mutation.ts           |   43 +-
 components/dashboard/src/index.css            |    4 +-
 .../dashboard/src/login/SSOLoginForm.tsx      |    7 +-
 .../detail/general/ManageRepoSuggestion.tsx   |    3 +-
 .../dashboard/src/start/StartWorkspace.tsx    |    2 +-
 .../dashboard/src/teams/TeamOnboarding.tsx    |   23 +-
 .../teams/onboarding/OrgMemberAvatarInput.tsx |   67 +
 .../onboarding/OrganizationJoinModal.tsx      |   58 +
 .../WelcomeMessageConfigurationField.tsx      |  108 +
 .../teams/onboarding/WelcomeMessageEditor.tsx |  103 +
 .../onboarding/WelcomeMessagePreview.tsx      |   54 +
 .../dashboard/src/workspaces/Workspaces.tsx   |   57 +-
 .../src/teams-projects-protocol.ts            |    9 +
 .../public-api/gitpod/v1/organization.proto   |   53 +-
 .../public-api/go/v1/organization.pb.go       | 1169 +++++----
 .../publicapi/v1/OrganizationOuterClass.java  | 2203 +++++++++++++++--
 .../src/public-api-converter.ts               |    1 +
 .../src/gitpod/v1/organization_pb.ts          |  112 +-
 components/server/package.json                |    2 +-
 .../src/api/organization-service-api.ts       |   87 +-
 .../server/src/orgs/organization-service.ts   |   66 +-
 yarn.lock                                     |  643 ++++-
 25 files changed, 4045 insertions(+), 861 deletions(-)
 create mode 100644 components/dashboard/src/components/podkit/forms/TextArea.tsx
 create mode 100644 components/dashboard/src/teams/onboarding/OrgMemberAvatarInput.tsx
 create mode 100644 components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx
 create mode 100644 components/dashboard/src/teams/onboarding/WelcomeMessageConfigurationField.tsx
 create mode 100644 components/dashboard/src/teams/onboarding/WelcomeMessageEditor.tsx
 create mode 100644 components/dashboard/src/teams/onboarding/WelcomeMessagePreview.tsx

diff --git a/components/dashboard/package.json b/components/dashboard/package.json
index 4c21c5ad9e6658..9f3aed9cd2778e 100644
--- a/components/dashboard/package.json
+++ b/components/dashboard/package.json
@@ -53,6 +53,7 @@
     "react-focus-on": "^3.8.1",
     "react-intl-tel-input": "^8.2.0",
     "react-linkedin-login-oauth2": "^2.0.1",
+    "react-markdown": "^9.0.3",
     "react-popper": "^2.3.0",
     "react-portal": "^4.2.2",
     "react-router-dom": "^5.2.0",
diff --git a/components/dashboard/src/components/forms/InputField.tsx b/components/dashboard/src/components/forms/InputField.tsx
index 7df8ffa326fbca..b1d2a0e4277ef9 100644
--- a/components/dashboard/src/components/forms/InputField.tsx
+++ b/components/dashboard/src/components/forms/InputField.tsx
@@ -16,16 +16,18 @@ type Props = {
     topMargin?: boolean;
     className?: string;
     disabled?: boolean;
+    labelHidden?: boolean;
 };
 
 export const InputField: FunctionComponent<Props> = memo(
-    ({ label, id, hint, error, topMargin = true, className, children, disabled = false }) => {
+    ({ label, id, hint, error, topMargin = true, className, children, disabled = false, labelHidden = false }) => {
         return (
             <div className={cn("flex flex-col space-y-2", { "mt-4": topMargin }, className)}>
                 {label && (
                     <label
                         className={cn(
                             "text-md font-semibold",
+                            { "sr-only": labelHidden },
                             disabled
                                 ? "text-gray-400 dark:text-gray-400"
                                 : error
diff --git a/components/dashboard/src/components/podkit/forms/TextArea.tsx b/components/dashboard/src/components/podkit/forms/TextArea.tsx
new file mode 100644
index 00000000000000..ed44bce408c11d
--- /dev/null
+++ b/components/dashboard/src/components/podkit/forms/TextArea.tsx
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import * as React from "react";
+
+import { cn } from "@podkit/lib/cn";
+
+const Textarea = React.forwardRef<HTMLTextAreaElement, React.ComponentProps<"textarea">>(
+    ({ className, ...props }, ref) => {
+        return (
+            <textarea
+                className={cn(
+                    "flex min-h-[80px] w-full rounded-md border border-input bg-pk-surface-primary px-3 py-2 text-base ring-offset-background placeholder:text-pk-content-secondary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+                    className,
+                )}
+                ref={ref}
+                {...props}
+            />
+        );
+    },
+);
+Textarea.displayName = "Textarea";
+
+export { Textarea };
diff --git a/components/dashboard/src/data/organizations/update-org-settings-mutation.ts b/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
index 6538555a0ab1d3..c536da96c5804d 100644
--- a/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
+++ b/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
@@ -14,21 +14,25 @@ import { useOrgWorkspaceClassesQueryInvalidator } from "./org-workspace-classes-
 import { PlainMessage } from "@bufbuild/protobuf";
 import { useOrgRepoSuggestionsInvalidator } from "./suggested-repositories-query";
 
-type UpdateOrganizationSettingsArgs = Partial<
-    Pick<
-        PlainMessage<OrganizationSettings>,
-        | "workspaceSharingDisabled"
-        | "defaultWorkspaceImage"
-        | "allowedWorkspaceClasses"
-        | "pinnedEditorVersions"
-        | "restrictedEditorNames"
-        | "defaultRole"
-        | "timeoutSettings"
-        | "roleRestrictions"
-        | "maxParallelRunningWorkspaces"
-        | "onboardingSettings"
-        | "annotateGitCommits"
-    >
+export type UpdateOrganizationSettingsArgs = Partial<
+    Omit<
+        Pick<
+            PlainMessage<OrganizationSettings>,
+            | "workspaceSharingDisabled"
+            | "defaultWorkspaceImage"
+            | "allowedWorkspaceClasses"
+            | "pinnedEditorVersions"
+            | "restrictedEditorNames"
+            | "defaultRole"
+            | "timeoutSettings"
+            | "roleRestrictions"
+            | "maxParallelRunningWorkspaces"
+            | "annotateGitCommits"
+        >,
+        never
+    > & {
+        onboardingSettings?: Partial<PlainMessage<OrganizationSettings>["onboardingSettings"]>; // this enables us to not have to specify all of the onboarding settings on every update
+    }
 >;
 
 export const useUpdateOrgSettingsMutation = () => {
@@ -66,7 +70,14 @@ export const useUpdateOrgSettingsMutation = () => {
                 roleRestrictions,
                 updateRoleRestrictions: !!roleRestrictions,
                 maxParallelRunningWorkspaces,
-                onboardingSettings,
+                onboardingSettings: {
+                    ...onboardingSettings,
+                    updateRecommendedRepositories: !!onboardingSettings?.recommendedRepositories,
+                    welcomeMessage: {
+                        ...onboardingSettings?.welcomeMessage,
+                        featuredMemberResolvedAvatarUrl: undefined, // This field is not allowed to be set in the request.
+                    },
+                },
                 annotateGitCommits,
             });
             return settings.settings!;
diff --git a/components/dashboard/src/index.css b/components/dashboard/src/index.css
index 073dbfe20affec..638f323ea2b5a9 100644
--- a/components/dashboard/src/index.css
+++ b/components/dashboard/src/index.css
@@ -95,7 +95,7 @@
         margin: 0 auto !important;
     }
     p {
-        @apply text-sm text-gray-400 dark:text-gray-600;
+        @apply text-sm text-pk-content-secondary;
     }
 
     .app-container {
@@ -118,7 +118,7 @@
     }
 
     code {
-        @apply bg-gray-100 dark:bg-gray-800 px-1.5 py-0.5 rounded-md text-sm font-mono font-medium;
+        @apply bg-gray-100 dark:bg-gray-800 text-pk-content-primary px-1.5 py-0.5 rounded-md text-sm font-mono font-medium;
     }
 
     textarea,
diff --git a/components/dashboard/src/login/SSOLoginForm.tsx b/components/dashboard/src/login/SSOLoginForm.tsx
index c6226dc0e3442e..5fecb9fea78ec3 100644
--- a/components/dashboard/src/login/SSOLoginForm.tsx
+++ b/components/dashboard/src/login/SSOLoginForm.tsx
@@ -16,10 +16,6 @@ import { useOnboardingState } from "../dedicated-setup/use-needs-setup";
 import { getOrgSlugFromQuery } from "../data/organizations/orgs-query";
 import { storageAvailable } from "../utils";
 
-type Props = {
-    onSuccess: () => void;
-};
-
 function getOrgSlugFromPath(path: string) {
     // '/login/acme' => ['', 'login', 'acme']
     const pathSegments = path.split("/");
@@ -29,6 +25,9 @@ function getOrgSlugFromPath(path: string) {
     return pathSegments[2];
 }
 
+type Props = {
+    onSuccess: () => void;
+};
 export const SSOLoginForm: FC<Props> = ({ onSuccess }) => {
     const location = useLocation();
     const { data: onboardingState } = useOnboardingState();
diff --git a/components/dashboard/src/repositories/detail/general/ManageRepoSuggestion.tsx b/components/dashboard/src/repositories/detail/general/ManageRepoSuggestion.tsx
index e7f871d925e097..69207cd12901ce 100644
--- a/components/dashboard/src/repositories/detail/general/ManageRepoSuggestion.tsx
+++ b/components/dashboard/src/repositories/detail/general/ManageRepoSuggestion.tsx
@@ -36,7 +36,6 @@ export const ManageRepoSuggestion: FC<Props> = ({ configuration }) => {
             await updateTeamSettings.mutateAsync(
                 {
                     onboardingSettings: {
-                        ...orgSettings?.onboardingSettings,
                         recommendedRepositories: [...newRepositories],
                     },
                 },
@@ -47,7 +46,7 @@ export const ManageRepoSuggestion: FC<Props> = ({ configuration }) => {
                 },
             );
         },
-        [orgSettings?.onboardingSettings, toast, updateTeamSettings],
+        [orgSettings?.onboardingSettings?.recommendedRepositories, toast, updateTeamSettings],
     );
 
     const isSuggested = orgSettings?.onboardingSettings?.recommendedRepositories?.includes(configuration.id);
diff --git a/components/dashboard/src/start/StartWorkspace.tsx b/components/dashboard/src/start/StartWorkspace.tsx
index c7e1800dc0f660..b6b65baf65121d 100644
--- a/components/dashboard/src/start/StartWorkspace.tsx
+++ b/components/dashboard/src/start/StartWorkspace.tsx
@@ -88,7 +88,7 @@ function parseParameters(search?: string): { notFound?: boolean } {
 
 export interface StartWorkspaceState {
     /**
-     * This is set to the istanceId we started (think we started on).
+     * This is set to the instanceId we started (think we started on).
      * We only receive updates for this particular instance, or none if not set.
      */
     startedInstanceId?: string;
diff --git a/components/dashboard/src/teams/TeamOnboarding.tsx b/components/dashboard/src/teams/TeamOnboarding.tsx
index 48dc86a61169a2..25626d0c8c6de2 100644
--- a/components/dashboard/src/teams/TeamOnboarding.tsx
+++ b/components/dashboard/src/teams/TeamOnboarding.tsx
@@ -4,18 +4,19 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { OrganizationSettings } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { FormEvent, useCallback, useEffect, useState } from "react";
 import { Heading2, Heading3, Subheading } from "../components/typography/headings";
 import { useIsOwner } from "../data/organizations/members-query";
 import { useOrgSettingsQuery } from "../data/organizations/org-settings-query";
 import { useCurrentOrg } from "../data/organizations/orgs-query";
-import { useUpdateOrgSettingsMutation } from "../data/organizations/update-org-settings-mutation";
+import {
+    UpdateOrganizationSettingsArgs,
+    useUpdateOrgSettingsMutation,
+} from "../data/organizations/update-org-settings-mutation";
 import { OrgSettingsPage } from "./OrgSettingsPage";
 import { ConfigurationSettingsField } from "../repositories/detail/ConfigurationSettingsField";
 import { useDocumentTitle } from "../hooks/use-document-title";
 import { useToast } from "../components/toasts/Toasts";
-import type { PlainMessage } from "@bufbuild/protobuf";
 import { InputField } from "../components/forms/InputField";
 import { TextInput } from "../components/forms/TextInputField";
 import { LoadingButton } from "@podkit/buttons/LoadingButton";
@@ -24,11 +25,16 @@ import { useOrgSuggestedRepos } from "../data/organizations/suggested-repositori
 import { RepositoryListItem } from "../repositories/list/RepoListItem";
 import { LoadingState } from "@podkit/loading/LoadingState";
 import { Table, TableHeader, TableRow, TableHead, TableBody } from "@podkit/tables/Table";
+import { WelcomeMessageConfigurationField } from "./onboarding/WelcomeMessageConfigurationField";
+
+export type UpdateTeamSettingsOptions = {
+    throwMutateError?: boolean;
+};
 
 export default function TeamOnboardingPage() {
     useDocumentTitle("Organization Settings - Onboarding");
     const { toast } = useToast();
-    const org = useCurrentOrg().data;
+    const { data: org } = useCurrentOrg();
     const isOwner = useIsOwner();
 
     const { data: settings } = useOrgSettingsQuery();
@@ -39,7 +45,7 @@ export default function TeamOnboardingPage() {
     const [internalLink, setInternalLink] = useState<string | undefined>(undefined);
 
     const handleUpdateTeamSettings = useCallback(
-        async (newSettings: Partial<PlainMessage<OrganizationSettings>>, options?: { throwMutateError?: boolean }) => {
+        async (newSettings: UpdateOrganizationSettingsArgs, options?: UpdateTeamSettingsOptions) => {
             if (!org?.id) {
                 throw new Error("no organization selected");
             }
@@ -70,11 +76,10 @@ export default function TeamOnboardingPage() {
             await handleUpdateTeamSettings({
                 onboardingSettings: {
                     internalLink,
-                    recommendedRepositories: settings?.onboardingSettings?.recommendedRepositories ?? [],
                 },
             });
         },
-        [handleUpdateTeamSettings, internalLink, settings?.onboardingSettings?.recommendedRepositories],
+        [handleUpdateTeamSettings, internalLink],
     );
 
     useEffect(() => {
@@ -146,7 +151,7 @@ export default function TeamOnboardingPage() {
                                 </TableRow>
                             </TableHeader>
                             <TableBody>
-                                {(suggestedRepos ?? []).map((repo) => (
+                                {suggestedRepos?.map((repo) => (
                                     <RepositoryListItem
                                         key={repo.configurationId}
                                         configuration={repo.configuration}
@@ -157,6 +162,8 @@ export default function TeamOnboardingPage() {
                         </Table>
                     )}
                 </ConfigurationSettingsField>
+
+                <WelcomeMessageConfigurationField handleUpdateTeamSettings={handleUpdateTeamSettings} />
             </div>
         </OrgSettingsPage>
     );
diff --git a/components/dashboard/src/teams/onboarding/OrgMemberAvatarInput.tsx b/components/dashboard/src/teams/onboarding/OrgMemberAvatarInput.tsx
new file mode 100644
index 00000000000000..b8a163f83feb01
--- /dev/null
+++ b/components/dashboard/src/teams/onboarding/OrgMemberAvatarInput.tsx
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { useState } from "react";
+import { useListOrganizationMembers } from "../../data/organizations/members-query";
+
+import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { Button } from "@podkit/buttons/Button";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@podkit/dropdown/DropDown";
+
+type Props = {
+    settings: OnboardingSettings_WelcomeMessage | undefined;
+    setFeaturedMemberId: (featuredMemberId: string | undefined) => void;
+};
+export const OrgMemberAvatarInput = ({ settings, setFeaturedMemberId }: Props) => {
+    const { data: members } = useListOrganizationMembers();
+
+    const [avatarUrl, setAvatarUrl] = useState<string | undefined>(settings?.featuredMemberResolvedAvatarUrl);
+
+    return (
+        <DropdownMenu>
+            <DropdownMenuTrigger>
+                <div className="flex flex-col justify-center items-center gap-2">
+                    {avatarUrl ? (
+                        <img src={avatarUrl} alt="" className="w-16 h-16 rounded-full" />
+                    ) : (
+                        <div className="w-16 h-16 rounded-full bg-[#EA71DE]" />
+                    )}
+                    <Button variant="secondary" size="sm" type="button">
+                        Change Photo
+                    </Button>
+                </div>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent>
+                <DropdownMenuItem
+                    key="disabled"
+                    onClick={() => {
+                        setFeaturedMemberId(undefined);
+                        setAvatarUrl(undefined);
+                    }}
+                >
+                    <div className="flex items-center gap-2">
+                        <div className="w-4 h-4 rounded-full bg-pk-surface-tertiary" />
+                        Disable image
+                    </div>
+                </DropdownMenuItem>
+                {members?.map((member) => (
+                    <DropdownMenuItem
+                        key={member.userId}
+                        onClick={() => {
+                            setFeaturedMemberId(member.userId);
+                            setAvatarUrl(member.avatarUrl);
+                        }}
+                    >
+                        <div className="flex items-center gap-2">
+                            <img src={member.avatarUrl} alt={member.fullName} className="w-4 h-4 rounded-full" />
+                            {member.fullName}
+                        </div>
+                    </DropdownMenuItem>
+                ))}
+            </DropdownMenuContent>
+        </DropdownMenu>
+    );
+};
diff --git a/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx b/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx
new file mode 100644
index 00000000000000..db7b2a6ffcabbe
--- /dev/null
+++ b/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { OrganizationSettings } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { Button } from "@podkit/buttons/Button";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Modal, ModalBody, ModalFooter, ModalHeader } from "../../components/Modal";
+import { storageAvailable } from "../../utils";
+import { WelcomeMessagePreview } from "./WelcomeMessagePreview";
+
+type Props = {
+    orgSettings: OrganizationSettings;
+};
+export const OrganizationJoinModal = ({ orgSettings }: Props) => {
+    const initialOrgOnboardingPending = useMemo(() => {
+        if (storageAvailable("localStorage")) {
+            return localStorage.getItem("newUserOnboardingPending") === "true";
+        }
+    }, []);
+    const dismissOrgOnboardingPending = useCallback(() => {
+        if (storageAvailable("localStorage")) {
+            localStorage.removeItem("newUserOnboardingPending");
+        }
+
+        setOrgOnboardingPending(false);
+    }, []);
+    const [orgOnboardingPending, setOrgOnboardingPending] = useState(initialOrgOnboardingPending ?? false);
+
+    // if the org-wide welcome message is not enabled, prevent showing it in the future
+    useEffect(() => {
+        if (!orgSettings?.onboardingSettings?.welcomeMessage?.enabled) {
+            dismissOrgOnboardingPending();
+        }
+    }, [orgSettings?.onboardingSettings?.welcomeMessage?.enabled, dismissOrgOnboardingPending]);
+
+    if (!orgSettings?.onboardingSettings?.welcomeMessage?.enabled) {
+        return null;
+    }
+
+    return (
+        <Modal
+            visible={orgOnboardingPending}
+            onClose={dismissOrgOnboardingPending}
+            containerClassName="min-[576px]:max-w-[650px]"
+        >
+            <ModalHeader>Welcome to Gitpod</ModalHeader>
+            <ModalBody>
+                <WelcomeMessagePreview hideHeader />
+            </ModalBody>
+            <ModalFooter>
+                <Button onClick={dismissOrgOnboardingPending}>Get Started</Button>
+            </ModalFooter>
+        </Modal>
+    );
+};
diff --git a/components/dashboard/src/teams/onboarding/WelcomeMessageConfigurationField.tsx b/components/dashboard/src/teams/onboarding/WelcomeMessageConfigurationField.tsx
new file mode 100644
index 00000000000000..35c02bd18afaec
--- /dev/null
+++ b/components/dashboard/src/teams/onboarding/WelcomeMessageConfigurationField.tsx
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { PlainMessage } from "@bufbuild/protobuf";
+import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { SwitchInputField } from "@podkit/switch/Switch";
+import { Heading3, Subheading } from "@podkit/typography/Headings";
+import { useCallback, useState } from "react";
+import { InputField } from "../../components/forms/InputField";
+import { useToast } from "../../components/toasts/Toasts";
+import { useIsOwner } from "../../data/organizations/members-query";
+import { useOrgSettingsQuery } from "../../data/organizations/org-settings-query";
+import {
+    UpdateOrganizationSettingsArgs,
+    useUpdateOrgSettingsMutation,
+} from "../../data/organizations/update-org-settings-mutation";
+import { ConfigurationSettingsField } from "../../repositories/detail/ConfigurationSettingsField";
+import { UpdateTeamSettingsOptions } from "../TeamOnboarding";
+import { WelcomeMessageEditorModal } from "./WelcomeMessageEditor";
+import { WelcomeMessagePreview } from "./WelcomeMessagePreview";
+
+export const gitpodWelcomeSubheading =
+    `With Gitpod, you'll start coding instantly in a pre-configured environment that matches your team's setup, giving you the freedom to focus on what matters most: writing great code.` as const;
+
+type Props = {
+    handleUpdateTeamSettings: (
+        newSettings: UpdateOrganizationSettingsArgs,
+        options?: UpdateTeamSettingsOptions,
+    ) => Promise<void>;
+};
+export const WelcomeMessageConfigurationField = ({ handleUpdateTeamSettings }: Props) => {
+    const { data: settings } = useOrgSettingsQuery();
+    const { toast } = useToast();
+    const isOwner = useIsOwner();
+    const updateTeamSettings = useUpdateOrgSettingsMutation();
+
+    const [welcomeMessageEditorOpen, setWelcomeMessageEditorOpen] = useState(false);
+
+    const handleUpdateWelcomeMessage = useCallback(
+        async (newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>, options?: UpdateTeamSettingsOptions) => {
+            await handleUpdateTeamSettings(
+                {
+                    onboardingSettings: {
+                        welcomeMessage: {
+                            ...settings?.onboardingSettings?.welcomeMessage,
+                            ...newSettings,
+                        },
+                    },
+                },
+                options,
+            );
+        },
+        [handleUpdateTeamSettings, settings?.onboardingSettings?.welcomeMessage],
+    );
+
+    return (
+        <ConfigurationSettingsField>
+            <Heading3>Welcome message</Heading3>
+            <Subheading>
+                A welcome message to your organization members. This message will be shown to your organization members
+                once they sign up and join your organization.
+            </Subheading>
+
+            <InputField
+                label="Enabled"
+                hint={<>Enable showing the message to new organization members.</>}
+                id="show-welcome-message"
+            >
+                <SwitchInputField
+                    id="show-welcome-message"
+                    checked={settings?.onboardingSettings?.welcomeMessage?.enabled ?? false}
+                    disabled={!isOwner || updateTeamSettings.isLoading}
+                    onCheckedChange={(checked) => {
+                        if (checked) {
+                            if (!settings?.onboardingSettings?.welcomeMessage?.message) {
+                                toast("Please set up a welcome message first.");
+                                return;
+                            }
+                        }
+
+                        handleUpdateWelcomeMessage({ enabled: checked });
+                    }}
+                    label=""
+                />
+            </InputField>
+
+            <WelcomeMessageEditorModal
+                isLoading={updateTeamSettings.isLoading}
+                isOwner={isOwner}
+                isOpen={welcomeMessageEditorOpen}
+                setIsOpen={setWelcomeMessageEditorOpen}
+                handleUpdateWelcomeMessage={handleUpdateWelcomeMessage}
+                settings={settings?.onboardingSettings?.welcomeMessage}
+            />
+
+            <span className="text-pk-content-secondary text-sm">
+                Here's a preview of the welcome message that will be shown to your organization members:
+            </span>
+            <WelcomeMessagePreview
+                setWelcomeMessageEditorOpen={setWelcomeMessageEditorOpen}
+                disabled={!isOwner || updateTeamSettings.isLoading}
+            />
+        </ConfigurationSettingsField>
+    );
+};
diff --git a/components/dashboard/src/teams/onboarding/WelcomeMessageEditor.tsx b/components/dashboard/src/teams/onboarding/WelcomeMessageEditor.tsx
new file mode 100644
index 00000000000000..a75f70dd02ecda
--- /dev/null
+++ b/components/dashboard/src/teams/onboarding/WelcomeMessageEditor.tsx
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { PlainMessage } from "@bufbuild/protobuf";
+import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { Button } from "@podkit/buttons/Button";
+import { LoadingButton } from "@podkit/buttons/LoadingButton";
+import { Textarea } from "@podkit/forms/TextArea";
+import { FormEvent, useCallback, useState } from "react";
+import Alert from "../../components/Alert";
+import { Modal, ModalBody, ModalFooter, ModalHeader } from "../../components/Modal";
+import { InputField } from "../../components/forms/InputField";
+import { TextInput } from "../../components/forms/TextInputField";
+import { UpdateTeamSettingsOptions } from "../TeamOnboarding";
+import { OrgMemberAvatarInput } from "./OrgMemberAvatarInput";
+import { gitpodWelcomeSubheading } from "./WelcomeMessageConfigurationField";
+
+type Props = {
+    settings: OnboardingSettings_WelcomeMessage | undefined;
+    isLoading: boolean;
+    isOwner: boolean;
+    isOpen: boolean;
+    handleUpdateWelcomeMessage: (
+        newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>,
+        options?: UpdateTeamSettingsOptions,
+    ) => Promise<void>;
+    setIsOpen: (isOpen: boolean) => void;
+};
+export const WelcomeMessageEditorModal = ({
+    isLoading,
+    isOwner,
+    settings,
+    isOpen,
+    handleUpdateWelcomeMessage,
+    setIsOpen,
+}: Props) => {
+    const [message, setMessage] = useState<string | undefined>(settings?.message);
+    const [featuredMemberId, setFeaturedMemberId] = useState<string | undefined>(settings?.featuredMemberId);
+    const [error, setError] = useState<string | undefined>(undefined);
+
+    const updateWelcomeMessage = useCallback(
+        async (e: FormEvent) => {
+            e.preventDefault();
+            try {
+                await handleUpdateWelcomeMessage(
+                    {
+                        message,
+                        featuredMemberId,
+                        enabled: settings?.enabled ?? false,
+                    },
+                    {
+                        throwMutateError: true,
+                    },
+                );
+                setIsOpen(false);
+                setError(undefined);
+            } catch (error) {
+                setError(error.message);
+            }
+        },
+        [handleUpdateWelcomeMessage, message, featuredMemberId, settings?.enabled, setIsOpen],
+    );
+
+    return (
+        <Modal onClose={() => setIsOpen(false)} visible={isOpen} containerClassName="min-[576px]:max-w-[650px]">
+            <ModalHeader>Edit welcome message</ModalHeader>
+            <ModalBody>
+                <form id="welcome-message-editor" onSubmit={updateWelcomeMessage} className="space-y-4">
+                    <TextInput readOnly value="Welcome to Gitpod" className="cursor-default"></TextInput>
+                    <Textarea value={gitpodWelcomeSubheading} readOnly className="cursor-default resize-none" />
+                    <div className="w-full flex justify-center">
+                        <OrgMemberAvatarInput settings={settings} setFeaturedMemberId={setFeaturedMemberId} />
+                    </div>
+                    <InputField label="Welcome message" error={undefined} className="mb-4" labelHidden>
+                        <Textarea
+                            className="bg-pk-surface-secondary text-pk-content-primary w-full p-4 rounded-xl min-h-[150px]"
+                            value={message}
+                            placeholder="Write a welcome message to your organization members. Markdown formatting is supported."
+                            onChange={(e) => setMessage(e.target.value)}
+                        />
+                    </InputField>
+
+                    {error && (
+                        <Alert type={"error"} closable={false}>
+                            <p>{error}</p>
+                        </Alert>
+                    )}
+                </form>
+            </ModalBody>
+            <ModalFooter>
+                <Button variant="secondary" onClick={() => setIsOpen(false)}>
+                    Cancel
+                </Button>
+                <LoadingButton type="submit" loading={isLoading} disabled={!isOwner} form="welcome-message-editor">
+                    Save
+                </LoadingButton>
+            </ModalFooter>
+        </Modal>
+    );
+};
diff --git a/components/dashboard/src/teams/onboarding/WelcomeMessagePreview.tsx b/components/dashboard/src/teams/onboarding/WelcomeMessagePreview.tsx
new file mode 100644
index 00000000000000..afdd9fe15525ec
--- /dev/null
+++ b/components/dashboard/src/teams/onboarding/WelcomeMessagePreview.tsx
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { Button } from "@podkit/buttons/Button";
+import { Heading1, Heading2, Heading3, Subheading } from "@podkit/typography/Headings";
+import Markdown from "react-markdown";
+import { useOrgSettingsQuery } from "../../data/organizations/org-settings-query";
+import { gitpodWelcomeSubheading } from "./WelcomeMessageConfigurationField";
+
+type Props = {
+    disabled?: boolean;
+    hideHeader?: boolean;
+    setWelcomeMessageEditorOpen?: (open: boolean) => void;
+};
+export const WelcomeMessagePreview = ({ disabled, setWelcomeMessageEditorOpen, hideHeader }: Props) => {
+    const { data: settings } = useOrgSettingsQuery();
+    const avatarUrl = settings?.onboardingSettings?.welcomeMessage?.featuredMemberResolvedAvatarUrl;
+    const welcomeMessage = settings?.onboardingSettings?.welcomeMessage?.message;
+
+    return (
+        <div className="max-w-2xl mx-auto">
+            <div className="flex justify-between gap-2 items-center">
+                {!hideHeader && <Heading2 className="py-6">Welcome to Gitpod</Heading2>}
+                {setWelcomeMessageEditorOpen && (
+                    <Button variant="secondary" onClick={() => setWelcomeMessageEditorOpen(true)} disabled={disabled}>
+                        Edit
+                    </Button>
+                )}
+            </div>
+            <Subheading>{gitpodWelcomeSubheading}</Subheading>
+            {welcomeMessage && (
+                <article className="p-8 my-4 bg-pk-surface-secondary text-pk-content-primary rounded-xl flex flex-col gap-5 items-center justify-center">
+                    {avatarUrl && <img src={avatarUrl} alt="" className="w-12 h-12 rounded-full" />}
+                    <Markdown
+                        className="space-y-4 text-center bg-pk-surface-secondary"
+                        components={{
+                            ul: ({ children }) => <ul className="list-disc list-inside">{children}</ul>,
+                            ol: ({ children }) => <ol className="list-decimal list-inside">{children}</ol>,
+                            img: ({ src, alt }) => <img src={src} alt={alt} className="w-full rounded-lg" />,
+                            h1: ({ children }) => <Heading1 className="text-left text-2xl">{children}</Heading1>,
+                            h2: ({ children }) => <Heading2 className="text-left text-xl">{children}</Heading2>,
+                            h3: ({ children }) => <Heading3 className="text-left text-lg">{children}</Heading3>,
+                        }}
+                    >
+                        {welcomeMessage}
+                    </Markdown>
+                </article>
+            )}
+        </div>
+    );
+};
diff --git a/components/dashboard/src/workspaces/Workspaces.tsx b/components/dashboard/src/workspaces/Workspaces.tsx
index b6f08a5057441d..e53665c74ea841 100644
--- a/components/dashboard/src/workspaces/Workspaces.tsx
+++ b/components/dashboard/src/workspaces/Workspaces.tsx
@@ -4,42 +4,43 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { FunctionComponent, useCallback, useEffect, useMemo, useState } from "react";
-import Header from "../components/Header";
-import { WorkspaceEntry } from "./WorkspaceEntry";
-import { ItemsList } from "../components/ItemsList";
-import Arrow from "../components/Arrow";
-import ConfirmationModal from "../components/ConfirmationModal";
-import { useListWorkspacesQuery } from "../data/workspaces/list-workspaces-query";
-import { EmptyWorkspacesContent } from "./EmptyWorkspacesContent";
-import { WorkspacesSearchBar } from "./WorkspacesSearchBar";
 import { hoursBefore, isDateSmallerOrEqual } from "@gitpod/gitpod-protocol/lib/util/timeutil";
-import { useDeleteInactiveWorkspacesMutation } from "../data/workspaces/delete-inactive-workspaces-mutation";
-import { useToast } from "../components/toasts/Toasts";
 import { Workspace, WorkspacePhase_Phase } from "@gitpod/public-api/lib/gitpod/v1/workspace_pb";
 import { Button } from "@podkit/buttons/Button";
-import { VideoCarousel } from "./VideoCarousel";
-import { BlogBanners } from "./BlogBanners";
-import { Book, BookOpen, Building, ChevronRight, Code, Video } from "lucide-react";
-import { ReactComponent as GitpodStrokedSVG } from "../icons/gitpod-stroked.svg";
-import PersonalizedContent from "./PersonalizedContent";
-import { useListenToWorkspacesWSMessages as useListenToWorkspacesStatusUpdates } from "../data/workspaces/listen-to-workspace-ws-messages";
+import { cn } from "@podkit/lib/cn";
 import { Subheading } from "@podkit/typography/Headings";
-import { useCurrentOrg } from "../data/organizations/orgs-query";
+import { Book, BookOpen, Building, ChevronRight, Code, Video } from "lucide-react";
+import { FunctionComponent, useCallback, useEffect, useMemo, useState } from "react";
 import { Link } from "react-router-dom";
-import { useOrgSettingsQuery } from "../data/organizations/org-settings-query";
-import Modal, { ModalBaseFooter, ModalBody, ModalHeader } from "../components/Modal";
-import { VideoSection } from "../onboarding/VideoSection";
 import { trackVideoClick } from "../Analytics";
-import { cn } from "@podkit/lib/cn";
-import { useUpdateCurrentUserMutation } from "../data/current-user/update-mutation";
-import { useUserLoader } from "../hooks/use-user-loader";
+import Arrow from "../components/Arrow";
+import ConfirmationModal from "../components/ConfirmationModal";
+import Header from "../components/Header";
+import { ItemsList } from "../components/ItemsList";
+import Modal, { ModalBaseFooter, ModalBody, ModalHeader } from "../components/Modal";
+import PillLabel from "../components/PillLabel";
+import { useToast } from "../components/toasts/Toasts";
 import Tooltip from "../components/Tooltip";
+import { useUpdateCurrentUserMutation } from "../data/current-user/update-mutation";
 import { useFeatureFlag } from "../data/featureflag-query";
-import { useInstallationConfiguration } from "../data/installation/installation-config-query";
-import { SuggestedOrgRepository, useOrgSuggestedRepos } from "../data/organizations/suggested-repositories-query";
 import { useSuggestedRepositories } from "../data/git-providers/suggested-repositories-query";
-import PillLabel from "../components/PillLabel";
+import { useOrgSettingsQuery } from "../data/organizations/org-settings-query";
+import { useCurrentOrg } from "../data/organizations/orgs-query";
+import { SuggestedOrgRepository, useOrgSuggestedRepos } from "../data/organizations/suggested-repositories-query";
+import { useDeleteInactiveWorkspacesMutation } from "../data/workspaces/delete-inactive-workspaces-mutation";
+import { useListWorkspacesQuery } from "../data/workspaces/list-workspaces-query";
+import { useListenToWorkspacesWSMessages as useListenToWorkspacesStatusUpdates } from "../data/workspaces/listen-to-workspace-ws-messages";
+import { useUserLoader } from "../hooks/use-user-loader";
+import { ReactComponent as GitpodStrokedSVG } from "../icons/gitpod-stroked.svg";
+import { VideoSection } from "../onboarding/VideoSection";
+import { OrganizationJoinModal } from "../teams/onboarding/OrganizationJoinModal";
+import { BlogBanners } from "./BlogBanners";
+import { EmptyWorkspacesContent } from "./EmptyWorkspacesContent";
+import PersonalizedContent from "./PersonalizedContent";
+import { VideoCarousel } from "./VideoCarousel";
+import { WorkspaceEntry } from "./WorkspaceEntry";
+import { WorkspacesSearchBar } from "./WorkspacesSearchBar";
+import { useInstallationConfiguration } from "../data/installation/installation-config-query";
 
 export const GETTING_STARTED_DISMISSAL_KEY = "workspace-list-getting-started";
 
@@ -477,6 +478,8 @@ const WorkspacesPage: FunctionComponent = () => {
                 ) : (
                     <EmptyWorkspacesContent />
                 ))}
+
+            {orgSettings && <OrganizationJoinModal orgSettings={orgSettings} />}
         </>
     );
 };
diff --git a/components/gitpod-protocol/src/teams-projects-protocol.ts b/components/gitpod-protocol/src/teams-projects-protocol.ts
index d32a3655abfdb2..ed0c73f7f05c3d 100644
--- a/components/gitpod-protocol/src/teams-projects-protocol.ts
+++ b/components/gitpod-protocol/src/teams-projects-protocol.ts
@@ -281,6 +281,15 @@ export interface OnboardingSettings {
      * the repository IDs of the repositories that are recommended for members to start with
      */
     recommendedRepositories?: string[];
+
+    /**
+     * the welcome message for new members of the organization
+     */
+    welcomeMessage?: {
+        featuredMemberId?: string;
+        message?: string;
+        footer?: string;
+    };
 }
 
 export type TeamMemberInfo = OrgMemberInfo;
diff --git a/components/public-api/gitpod/v1/organization.proto b/components/public-api/gitpod/v1/organization.proto
index 60438374d60314..c2aebf2ebdc178 100644
--- a/components/public-api/gitpod/v1/organization.proto
+++ b/components/public-api/gitpod/v1/organization.proto
@@ -34,7 +34,8 @@ enum OrganizationRole {
   ORGANIZATION_ROLE_COLLABORATOR = 3;
 }
 
-// OrganizationPermissions define permissions that are restrictable using RoleRestrictions
+// OrganizationPermissions define permissions that are restrictable using
+// RoleRestrictions
 enum OrganizationPermission {
   ORGANIZATION_PERMISSION_UNSPECIFIED = 0;
   ORGANIZATION_PERMISSION_START_ARBITRARY_REPOS = 1;
@@ -48,11 +49,40 @@ message RoleRestrictionEntry {
   repeated OrganizationPermission permissions = 2;
 }
 
+// onboarding_settings are the settings for the organization's onboarding
 message OnboardingSettings {
-  // internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+  message WelcomeMessage {
+    // enabled specifies whether the welcome message is enabled
+    bool enabled = 1;
+
+    // message is the welcome message for the organization
+    optional string message = 2;
+
+    // featured_member_id is the ID of the member to show in the welcome message
+    optional string featured_member_id = 4;
+
+    // featured_member_resolved_avatar_url is the avatar URL that is resolved
+    // from the featured_member_id by the server
+    // This field **can not** be set in the request.
+    optional string featured_member_resolved_avatar_url = 5;
+  }
+
+  // internal_link is the link to an internal onboarding page for the
+  // organization, possibly featuring a custom onboarding guide and other
+  // resources
   optional string internal_link = 1;
-  // recommended_repositories are the repositories that are recommended for new org members
+
+  // recommended_repositories are the repositories that are recommended for new
+  // org members
   repeated string recommended_repositories = 2;
+
+  // update_recommended_repositories specifies whether recommended_repositories
+  // should be updated.
+  // This field **will not** be specified in server responses.
+  optional bool update_recommended_repositories = 3;
+
+  // welcome_message is the welcome message for the organization
+  optional WelcomeMessage welcome_message = 4;
 }
 
 message OrganizationSettings {
@@ -64,7 +94,9 @@ message OrganizationSettings {
   string default_role = 6;
   TimeoutSettings timeout_settings = 7;
   repeated RoleRestrictionEntry role_restrictions = 8;
-  // max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+  // max_parallel_running_workspaces is the maximum number of workspaces that a
+  // single user can run in parallel. 0 resets to the default, which depends on
+  // the org plan
   int32 max_parallel_running_workspaces = 9;
   OnboardingSettings onboarding_settings = 10;
   bool annotate_git_commits = 11;
@@ -146,7 +178,8 @@ message TimeoutSettings {
   // inactivity is the duration of inactivity after which a workspace is stopped
   optional google.protobuf.Duration inactivity = 1;
 
-  // deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+  // deny_user_timeout specifies whether applying custom timeouts is denied for
+  // organization members
   optional bool deny_user_timeouts = 2;
 }
 
@@ -188,16 +221,20 @@ message UpdateOrganizationSettingsRequest {
 
   repeated RoleRestrictionEntry role_restrictions = 12;
 
-  // update_role_restrictions specifies whether role_restrictions should be updated
+  // update_role_restrictions specifies whether role_restrictions should be
+  // updated
   optional bool update_role_restrictions = 13;
 
-  // max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+  // max_parallel_running_workspaces is the maximum number of workspaces that a
+  // single user can run in parallel. 0 resets to the default, which depends on
+  // the org plan
   optional int32 max_parallel_running_workspaces = 15;
 
   // onboarding_settings are the settings for the organization's onboarding
   optional OnboardingSettings onboarding_settings = 16;
 
-  // annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+  // annotate_git_commits specifies whether to annotate git commits created in
+  // Gitpod workspaces with the gitpod host
   optional bool annotate_git_commits = 17;
 }
 
diff --git a/components/public-api/go/v1/organization.pb.go b/components/public-api/go/v1/organization.pb.go
index f976faf3858f1d..b5431bf1f65385 100644
--- a/components/public-api/go/v1/organization.pb.go
+++ b/components/public-api/go/v1/organization.pb.go
@@ -78,7 +78,8 @@ func (OrganizationRole) EnumDescriptor() ([]byte, []int) {
 	return file_gitpod_v1_organization_proto_rawDescGZIP(), []int{0}
 }
 
-// OrganizationPermissions define permissions that are restrictable using RoleRestrictions
+// OrganizationPermissions define permissions that are restrictable using
+// RoleRestrictions
 type OrganizationPermission int32
 
 const (
@@ -397,15 +398,25 @@ func (x *RoleRestrictionEntry) GetPermissions() []OrganizationPermission {
 	return nil
 }
 
+// onboarding_settings are the settings for the organization's onboarding
 type OnboardingSettings struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+	// internal_link is the link to an internal onboarding page for the
+	// organization, possibly featuring a custom onboarding guide and other
+	// resources
 	InternalLink *string `protobuf:"bytes,1,opt,name=internal_link,json=internalLink,proto3,oneof" json:"internal_link,omitempty"`
-	// recommended_repositories are the repositories that are recommended for new org members
+	// recommended_repositories are the repositories that are recommended for new
+	// org members
 	RecommendedRepositories []string `protobuf:"bytes,2,rep,name=recommended_repositories,json=recommendedRepositories,proto3" json:"recommended_repositories,omitempty"`
+	// update_recommended_repositories specifies whether recommended_repositories
+	// should be updated.
+	// This field **will not** be specified in server responses.
+	UpdateRecommendedRepositories *bool `protobuf:"varint,3,opt,name=update_recommended_repositories,json=updateRecommendedRepositories,proto3,oneof" json:"update_recommended_repositories,omitempty"`
+	// welcome_message is the welcome message for the organization
+	WelcomeMessage *OnboardingSettings_WelcomeMessage `protobuf:"bytes,4,opt,name=welcome_message,json=welcomeMessage,proto3,oneof" json:"welcome_message,omitempty"`
 }
 
 func (x *OnboardingSettings) Reset() {
@@ -454,6 +465,20 @@ func (x *OnboardingSettings) GetRecommendedRepositories() []string {
 	return nil
 }
 
+func (x *OnboardingSettings) GetUpdateRecommendedRepositories() bool {
+	if x != nil && x.UpdateRecommendedRepositories != nil {
+		return *x.UpdateRecommendedRepositories
+	}
+	return false
+}
+
+func (x *OnboardingSettings) GetWelcomeMessage() *OnboardingSettings_WelcomeMessage {
+	if x != nil {
+		return x.WelcomeMessage
+	}
+	return nil
+}
+
 type OrganizationSettings struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -467,7 +492,9 @@ type OrganizationSettings struct {
 	DefaultRole              string                  `protobuf:"bytes,6,opt,name=default_role,json=defaultRole,proto3" json:"default_role,omitempty"`
 	TimeoutSettings          *TimeoutSettings        `protobuf:"bytes,7,opt,name=timeout_settings,json=timeoutSettings,proto3" json:"timeout_settings,omitempty"`
 	RoleRestrictions         []*RoleRestrictionEntry `protobuf:"bytes,8,rep,name=role_restrictions,json=roleRestrictions,proto3" json:"role_restrictions,omitempty"`
-	// max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+	// max_parallel_running_workspaces is the maximum number of workspaces that a
+	// single user can run in parallel. 0 resets to the default, which depends on
+	// the org plan
 	MaxParallelRunningWorkspaces int32               `protobuf:"varint,9,opt,name=max_parallel_running_workspaces,json=maxParallelRunningWorkspaces,proto3" json:"max_parallel_running_workspaces,omitempty"`
 	OnboardingSettings           *OnboardingSettings `protobuf:"bytes,10,opt,name=onboarding_settings,json=onboardingSettings,proto3" json:"onboarding_settings,omitempty"`
 	AnnotateGitCommits           bool                `protobuf:"varint,11,opt,name=annotate_git_commits,json=annotateGitCommits,proto3" json:"annotate_git_commits,omitempty"`
@@ -805,7 +832,8 @@ type TimeoutSettings struct {
 
 	// inactivity is the duration of inactivity after which a workspace is stopped
 	Inactivity *durationpb.Duration `protobuf:"bytes,1,opt,name=inactivity,proto3,oneof" json:"inactivity,omitempty"`
-	// deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+	// deny_user_timeout specifies whether applying custom timeouts is denied for
+	// organization members
 	DenyUserTimeouts *bool `protobuf:"varint,2,opt,name=deny_user_timeouts,json=denyUserTimeouts,proto3,oneof" json:"deny_user_timeouts,omitempty"`
 }
 
@@ -886,13 +914,17 @@ type UpdateOrganizationSettingsRequest struct {
 	// timeout_settings are the settings for workspace timeouts
 	TimeoutSettings  *TimeoutSettings        `protobuf:"bytes,11,opt,name=timeout_settings,json=timeoutSettings,proto3,oneof" json:"timeout_settings,omitempty"`
 	RoleRestrictions []*RoleRestrictionEntry `protobuf:"bytes,12,rep,name=role_restrictions,json=roleRestrictions,proto3" json:"role_restrictions,omitempty"`
-	// update_role_restrictions specifies whether role_restrictions should be updated
+	// update_role_restrictions specifies whether role_restrictions should be
+	// updated
 	UpdateRoleRestrictions *bool `protobuf:"varint,13,opt,name=update_role_restrictions,json=updateRoleRestrictions,proto3,oneof" json:"update_role_restrictions,omitempty"`
-	// max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+	// max_parallel_running_workspaces is the maximum number of workspaces that a
+	// single user can run in parallel. 0 resets to the default, which depends on
+	// the org plan
 	MaxParallelRunningWorkspaces *int32 `protobuf:"varint,15,opt,name=max_parallel_running_workspaces,json=maxParallelRunningWorkspaces,proto3,oneof" json:"max_parallel_running_workspaces,omitempty"`
 	// onboarding_settings are the settings for the organization's onboarding
 	OnboardingSettings *OnboardingSettings `protobuf:"bytes,16,opt,name=onboarding_settings,json=onboardingSettings,proto3,oneof" json:"onboarding_settings,omitempty"`
-	// annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+	// annotate_git_commits specifies whether to annotate git commits created in
+	// Gitpod workspaces with the gitpod host
 	AnnotateGitCommits *bool `protobuf:"varint,17,opt,name=annotate_git_commits,json=annotateGitCommits,proto3,oneof" json:"annotate_git_commits,omitempty"`
 }
 
@@ -2181,6 +2213,83 @@ func (*DeleteOrganizationMemberResponse) Descriptor() ([]byte, []int) {
 	return file_gitpod_v1_organization_proto_rawDescGZIP(), []int{33}
 }
 
+type OnboardingSettings_WelcomeMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// enabled specifies whether the welcome message is enabled
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	// message is the welcome message for the organization
+	Message *string `protobuf:"bytes,2,opt,name=message,proto3,oneof" json:"message,omitempty"`
+	// featured_member_id is the ID of the member to show in the welcome message
+	FeaturedMemberId *string `protobuf:"bytes,4,opt,name=featured_member_id,json=featuredMemberId,proto3,oneof" json:"featured_member_id,omitempty"`
+	// featured_member_resolved_avatar_url is the avatar URL that is resolved
+	// from the featured_member_id by the server
+	// This field **can not** be set in the request.
+	FeaturedMemberResolvedAvatarUrl *string `protobuf:"bytes,5,opt,name=featured_member_resolved_avatar_url,json=featuredMemberResolvedAvatarUrl,proto3,oneof" json:"featured_member_resolved_avatar_url,omitempty"`
+}
+
+func (x *OnboardingSettings_WelcomeMessage) Reset() {
+	*x = OnboardingSettings_WelcomeMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gitpod_v1_organization_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OnboardingSettings_WelcomeMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OnboardingSettings_WelcomeMessage) ProtoMessage() {}
+
+func (x *OnboardingSettings_WelcomeMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_gitpod_v1_organization_proto_msgTypes[34]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OnboardingSettings_WelcomeMessage.ProtoReflect.Descriptor instead.
+func (*OnboardingSettings_WelcomeMessage) Descriptor() ([]byte, []int) {
+	return file_gitpod_v1_organization_proto_rawDescGZIP(), []int{3, 0}
+}
+
+func (x *OnboardingSettings_WelcomeMessage) GetEnabled() bool {
+	if x != nil {
+		return x.Enabled
+	}
+	return false
+}
+
+func (x *OnboardingSettings_WelcomeMessage) GetMessage() string {
+	if x != nil && x.Message != nil {
+		return *x.Message
+	}
+	return ""
+}
+
+func (x *OnboardingSettings_WelcomeMessage) GetFeaturedMemberId() string {
+	if x != nil && x.FeaturedMemberId != nil {
+		return *x.FeaturedMemberId
+	}
+	return ""
+}
+
+func (x *OnboardingSettings_WelcomeMessage) GetFeaturedMemberResolvedAvatarUrl() string {
+	if x != nil && x.FeaturedMemberResolvedAvatarUrl != nil {
+		return *x.FeaturedMemberResolvedAvatarUrl
+	}
+	return ""
+}
+
 var File_gitpod_v1_organization_proto protoreflect.FileDescriptor
 
 var file_gitpod_v1_organization_proto_rawDesc = []byte{
@@ -2230,458 +2339,489 @@ var file_gitpod_v1_organization_proto_rawDesc = []byte{
 	0x32, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67,
 	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
 	0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x22, 0x8b, 0x01, 0x0a, 0x12, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53,
+	0x22, 0x89, 0x05, 0x0a, 0x12, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53,
 	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x28, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x72,
 	0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
 	0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x88, 0x01,
 	0x01, 0x12, 0x39, 0x0a, 0x18, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64,
 	0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20,
 	0x03, 0x28, 0x09, 0x52, 0x17, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64,
-	0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x42, 0x10, 0x0a, 0x0e,
-	0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0xbb,
-	0x06, 0x0a, 0x14, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x3c, 0x0a, 0x1a, 0x77, 0x6f, 0x72, 0x6b, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x77, 0x6f, 0x72,
-	0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x17, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x57,
-	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x3a, 0x0a,
-	0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x17, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x17, 0x72, 0x65, 0x73,
-	0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x72, 0x65, 0x73, 0x74,
-	0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65,
-	0x73, 0x12, 0x6f, 0x0a, 0x16, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74,
-	0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x39, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x2e, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x70, 0x69,
-	0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f,
-	0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x45, 0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x0f, 0x74, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x4c, 0x0a, 0x11,
-	0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x10, 0x72, 0x6f, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x45, 0x0a, 0x1f, 0x6d, 0x61,
-	0x78, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69,
-	0x6e, 0x67, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x1c, 0x6d, 0x61, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c,
-	0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x73, 0x12, 0x4e, 0x0a, 0x13, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f,
-	0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
-	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x6e, 0x62, 0x6f, 0x61,
-	0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x12, 0x6f,
+	0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x1f,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64,
+	0x65, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x1d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69,
+	0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x5a, 0x0a, 0x0f, 0x77, 0x65, 0x6c,
+	0x63, 0x6f, 0x6d, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f,
 	0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x73, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x67, 0x69,
-	0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x12, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x47, 0x69, 0x74, 0x43, 0x6f, 0x6d, 0x6d,
-	0x69, 0x74, 0x73, 0x1a, 0x47, 0x0a, 0x19, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69,
-	0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a,
-	0x27, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22,
-	0xb1, 0x01, 0x0a, 0x28, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61,
-	0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0a,
-	0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52,
-	0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x11, 0x77,
-	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73,
-	0x73, 0x52, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73,
-	0x73, 0x65, 0x73, 0x22, 0x66, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88,
-	0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x59, 0x0a, 0x1a, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xaa, 0x01, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x3e, 0x0a, 0x0a, 0x69, 0x6e,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x61,
-	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x12, 0x64, 0x65,
-	0x6e, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x10, 0x64, 0x65, 0x6e, 0x79, 0x55, 0x73,
-	0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a,
-	0x0b, 0x5f, 0x69, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x15, 0x0a, 0x13,
-	0x5f, 0x64, 0x65, 0x6e, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x73, 0x22, 0x8a, 0x0b, 0x0a, 0x21, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x64, 0x12, 0x41, 0x0a, 0x1a, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f,
-	0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x18, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c,
-	0x65, 0x64, 0x88, 0x01, 0x01, 0x12, 0x3b, 0x0a, 0x17, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x15, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x88,
-	0x01, 0x01, 0x12, 0x3a, 0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x77, 0x6f,
-	0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x18,
-	0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x57, 0x6f,
-	0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x36,
-	0x0a, 0x17, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69,
-	0x74, 0x6f, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x15, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f,
-	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x1e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74,
-	0x6f, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x02,
-	0x52, 0x1b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74,
-	0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x88, 0x01, 0x01,
-	0x12, 0x7c, 0x0a, 0x16, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f,
-	0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x46, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x50,
-	0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64,
-	0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x46,
-	0x0a, 0x1d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f,
-	0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x08, 0x48, 0x03, 0x52, 0x1a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50,
-	0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0b,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x6f, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x4a,
-	0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x53, 0x65, 0x74, 0x74,
-	0x69, 0x6e, 0x67, 0x73, 0x48, 0x05, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x88, 0x01, 0x01, 0x12, 0x4c, 0x0a, 0x11, 0x72, 0x6f,
+	0x73, 0x2e, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x48, 0x02, 0x52, 0x0e, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x88, 0x01, 0x01, 0x1a, 0x9a, 0x02, 0x0a, 0x0e, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d,
+	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c,
+	0x65, 0x64, 0x12, 0x1d, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88, 0x01,
+	0x01, 0x12, 0x31, 0x0a, 0x12, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x64, 0x5f, 0x6d, 0x65,
+	0x6d, 0x62, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52,
+	0x10, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49,
+	0x64, 0x88, 0x01, 0x01, 0x12, 0x51, 0x0a, 0x23, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x64,
+	0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64,
+	0x5f, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x48, 0x02, 0x52, 0x1f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x64, 0x4d, 0x65, 0x6d,
+	0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x41, 0x76, 0x61, 0x74, 0x61,
+	0x72, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x64,
+	0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x42, 0x26, 0x0a, 0x24, 0x5f, 0x66,
+	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x72,
+	0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x5f, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x5f, 0x75,
+	0x72, 0x6c, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f,
+	0x6c, 0x69, 0x6e, 0x6b, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f,
+	0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x77, 0x65, 0x6c,
+	0x63, 0x6f, 0x6d, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xbb, 0x06, 0x0a,
+	0x14, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x3c, 0x0a, 0x1a, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x77, 0x6f, 0x72, 0x6b, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x17, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x77,
+	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x57, 0x6f, 0x72,
+	0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x3a, 0x0a, 0x19, 0x61,
+	0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17,
+	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x74, 0x72,
+	0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69,
+	0x63, 0x74, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12,
+	0x6f, 0x0a, 0x16, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72,
+	0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x39, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
+	0x2e, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x70, 0x69, 0x6e, 0x6e,
+	0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x21, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52,
+	0x6f, 0x6c, 0x65, 0x12, 0x45, 0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73,
+	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
+	0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
+	0x75, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x4c, 0x0a, 0x11, 0x72, 0x6f,
 	0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
 	0x31, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f,
 	0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x10, 0x72, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74,
-	0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x18, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x48, 0x06, 0x52, 0x16, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x88, 0x01, 0x01, 0x12, 0x4a, 0x0a, 0x1f, 0x6d, 0x61, 0x78, 0x5f, 0x70,
-	0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f,
-	0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05,
-	0x48, 0x07, 0x52, 0x1c, 0x6d, 0x61, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x52,
-	0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73,
-	0x88, 0x01, 0x01, 0x12, 0x53, 0x0a, 0x13, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e,
-	0x67, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x6e, 0x62,
-	0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x48,
-	0x08, 0x52, 0x12, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73,
-	0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x48, 0x09, 0x52, 0x12, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
-	0x74, 0x65, 0x47, 0x69, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x88, 0x01, 0x01, 0x1a,
-	0x47, 0x0a, 0x19, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x1d, 0x0a, 0x1b, 0x5f, 0x77, 0x6f, 0x72,
-	0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64,
-	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d,
-	0x61, 0x67, 0x65, 0x42, 0x21, 0x0a, 0x1f, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72,
+	0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x45, 0x0a, 0x1f, 0x6d, 0x61, 0x78, 0x5f,
+	0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67,
+	0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x1c, 0x6d, 0x61, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x52, 0x75,
+	0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x12,
+	0x4e, 0x0a, 0x13, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65,
+	0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64,
+	0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x12, 0x6f, 0x6e, 0x62,
+	0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12,
+	0x30, 0x0a, 0x14, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f,
+	0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x61,
+	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x47, 0x69, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74,
+	0x73, 0x1a, 0x47, 0x0a, 0x19, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f,
+	0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x27, 0x4c,
+	0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57,
+	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74,
+	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xb1, 0x01,
+	0x0a, 0x28, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73,
+	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x70, 0x61,
+	0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70,
+	0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x11, 0x77, 0x6f, 0x72,
+	0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x52,
+	0x10, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65,
+	0x73, 0x22, 0x66, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27,
+	0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01,
+	0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x59, 0x0a, 0x1a, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
+	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x22, 0xaa, 0x01, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x3e, 0x0a, 0x0a, 0x69, 0x6e, 0x61, 0x63,
+	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x61, 0x63, 0x74,
+	0x69, 0x76, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x12, 0x64, 0x65, 0x6e, 0x79,
+	0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x10, 0x64, 0x65, 0x6e, 0x79, 0x55, 0x73, 0x65, 0x72,
+	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f,
+	0x69, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x64,
+	0x65, 0x6e, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x73, 0x22, 0x8a, 0x0b, 0x0a, 0x21, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64,
+	0x12, 0x41, 0x0a, 0x1a, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x68,
+	0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x18, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64,
+	0x88, 0x01, 0x01, 0x12, 0x3b, 0x0a, 0x17, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x77,
+	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x15, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x57,
+	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01,
+	0x12, 0x3a, 0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x77, 0x6f, 0x72, 0x6b,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x17, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x57, 0x6f, 0x72, 0x6b,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x17,
+	0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f,
+	0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x72,
+	0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x1e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72,
 	0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x42, 0x20, 0x0a, 0x1e, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x5f, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f,
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x74, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x1b,
-	0x0a, 0x19, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72,
-	0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x0a, 0x20, 0x5f,
-	0x6d, 0x61, 0x78, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e,
-	0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x42,
-	0x16, 0x0a, 0x14, 0x5f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73,
-	0x22, 0x61, 0x0a, 0x22, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69,
-	0x6e, 0x67, 0x73, 0x22, 0x49, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
-	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5e,
-	0x0a, 0x1f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74,
-	0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22, 0x2f,
-	0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x59, 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a,
-	0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x16, 0x47, 0x65,
-	0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x56, 0x0a,
-	0x17, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
-	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xda, 0x01, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x02, 0x52, 0x1b,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64,
+	0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x7c,
+	0x0a, 0x16, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x46,
+	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x50, 0x69, 0x6e,
+	0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64,
+	0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x46, 0x0a, 0x1d,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64,
+	0x69, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x08, 0x48, 0x03, 0x52, 0x1a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x69, 0x6e,
+	0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
+	0x72, 0x6f, 0x6c, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0b, 0x64, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x6f, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x4a, 0x0a, 0x10,
+	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
+	0x67, 0x73, 0x48, 0x05, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x88, 0x01, 0x01, 0x12, 0x4c, 0x0a, 0x11, 0x72, 0x6f, 0x6c, 0x65,
+	0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0c, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
+	0x52, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x10, 0x72, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x18, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x48, 0x06, 0x52, 0x16, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x88, 0x01, 0x01, 0x12, 0x4a, 0x0a, 0x1f, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x61, 0x72,
+	0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x77, 0x6f,
+	0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x48, 0x07,
+	0x52, 0x1c, 0x6d, 0x61, 0x78, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x52, 0x75, 0x6e,
+	0x6e, 0x69, 0x6e, 0x67, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x88, 0x01,
+	0x01, 0x12, 0x53, 0x0a, 0x13, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f,
+	0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x6e, 0x62, 0x6f, 0x61,
+	0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x48, 0x08, 0x52,
+	0x12, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x74, 0x69,
+	0x6e, 0x67, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
+	0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x11,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x09, 0x52, 0x12, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65,
+	0x47, 0x69, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x88, 0x01, 0x01, 0x1a, 0x47, 0x0a,
+	0x19, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x1d, 0x0a, 0x1b, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73,
+	0x61, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67,
+	0x65, 0x42, 0x21, 0x0a, 0x1f, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x73,
+	0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x73, 0x42, 0x20, 0x0a, 0x1e, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f,
+	0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x65,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x74, 0x69, 0x6d, 0x65,
+	0x6f, 0x75, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x1b, 0x0a, 0x19,
+	0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73,
+	0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x6d, 0x61,
+	0x78, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69,
+	0x6e, 0x67, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x42, 0x16, 0x0a,
+	0x14, 0x5f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
+	0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x22, 0x61,
+	0x0a, 0x22, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
+	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x73, 0x22, 0x49, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5e, 0x0a, 0x1f,
+	0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
+	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
+	0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22, 0x2f, 0x0a, 0x19,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x59, 0x0a,
+	0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x56, 0x0a, 0x17, 0x47,
+	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x22, 0xda, 0x01, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f,
+	0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e,
+	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72,
 	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x3f, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x29, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70,
-	0x65, 0x22, 0x3f, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x43,
-	0x4f, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
-	0x00, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45,
-	0x52, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x41, 0x4c, 0x4c,
-	0x10, 0x02, 0x22, 0x99, 0x01, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x3d, 0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x3d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x44,
-	0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x4b, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22,
-	0x48, 0x0a, 0x21, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76,
-	0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x17, 0x4a, 0x6f, 0x69,
-	0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76,
-	0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x18, 0x4a, 0x6f, 0x69,
-	0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
-	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4d,
-	0x0a, 0x22, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x73, 0x74, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x22,
+	0x3f, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x43, 0x4f, 0x50,
+	0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x10, 0x0a, 0x0c, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10,
+	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x41, 0x4c, 0x4c, 0x10, 0x02,
+	0x22, 0x99, 0x01, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d,
+	0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d,
+	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3d, 0x0a,
+	0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61,
+	0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x44, 0x0a, 0x19,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x4b, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4a, 0x0a,
-	0x23, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76,
-	0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x87, 0x01, 0x0a, 0x1e, 0x4c, 0x69,
-	0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65,
-	0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f,
-	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0x99, 0x01, 0x0a, 0x1f, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65,
-	0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
-	0x12, 0x3d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
-	0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22,
-	0xa2, 0x01, 0x0a, 0x1f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x48, 0x0a,
+	0x21, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x17, 0x4a, 0x6f, 0x69, 0x6e, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x18, 0x4a, 0x6f, 0x69, 0x6e, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07,
-	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65,
-	0x48, 0x00, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f,
-	0x72, 0x6f, 0x6c, 0x65, 0x22, 0x59, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22,
-	0x63, 0x0a, 0x1f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x22,
+	0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
 	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x75,
-	0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73,
-	0x65, 0x72, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x94, 0x01, 0x0a, 0x10, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x21, 0x0a,
-	0x1d, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f,
-	0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x1b, 0x0a, 0x17, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e,
-	0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x4f, 0x57, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1c, 0x0a,
-	0x18, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f,
-	0x4c, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x4f,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x23, 0x52,
+	0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x87, 0x01, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74,
+	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62,
+	0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x64, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
+	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x22, 0x99, 0x01, 0x0a, 0x1f, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x3d,
+	0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50,
+	0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa2, 0x01,
+	0x0a, 0x1f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73,
+	0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x1b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x48, 0x00,
+	0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x72, 0x6f,
+	0x6c, 0x65, 0x22, 0x59, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x63, 0x0a,
+	0x1f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65,
+	0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72,
+	0x49, 0x64, 0x22, 0x22, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x94, 0x01, 0x0a, 0x10, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x4f,
 	0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45,
-	0x5f, 0x43, 0x4f, 0x4c, 0x4c, 0x41, 0x42, 0x4f, 0x52, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x03, 0x2a,
-	0x74, 0x0a, 0x16, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x52, 0x47,
-	0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53,
-	0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x31, 0x0a, 0x2d, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49,
-	0x4f, 0x4e, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54,
-	0x41, 0x52, 0x54, 0x5f, 0x41, 0x52, 0x42, 0x49, 0x54, 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45,
-	0x50, 0x4f, 0x53, 0x10, 0x01, 0x32, 0xbe, 0x0c, 0x0a, 0x13, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63, 0x0a,
-	0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x5a, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b,
+	0x0a, 0x17, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52,
+	0x4f, 0x4c, 0x45, 0x5f, 0x4f, 0x57, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x4f,
+	0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45,
+	0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x4f, 0x52, 0x47,
+	0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x43,
+	0x4f, 0x4c, 0x4c, 0x41, 0x42, 0x4f, 0x52, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x03, 0x2a, 0x74, 0x0a,
+	0x16, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72,
+	0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x52, 0x47, 0x41, 0x4e,
+	0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49,
+	0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x31, 0x0a, 0x2d, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x52,
+	0x54, 0x5f, 0x41, 0x52, 0x42, 0x49, 0x54, 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x50, 0x4f,
+	0x53, 0x10, 0x01, 0x32, 0xbe, 0x0c, 0x0a, 0x13, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63, 0x0a, 0x12, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
+	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x5a, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x12,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x60, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x67, 0x69,
+	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
 	0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63,
-	0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74,
-	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e,
-	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69,
-	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x47, 0x65,
+	0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47,
+	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
+	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x12, 0x5d, 0x0a, 0x10, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x69, 0x74,
+	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x7e, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73,
+	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
+	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x2e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x65,
 	0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76,
-	0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x10, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67,
-	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x7e, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52,
-	0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
-	0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x29,
-	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f,
+	0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x72, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
+	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f,
 	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65,
-	0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d,
-	0x62, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65,
-	0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75,
-	0x0a, 0x18, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74,
-	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
-	0x12, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74,
-	0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69,
-	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x1a, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e,
+	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62,
+	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x18,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x29,
+	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
+	0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
 	0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8d, 0x01, 0x0a, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x32, 0x2e, 0x67, 0x69,
-	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x33, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x51, 0x0a, 0x16, 0x69, 0x6f, 0x2e, 0x67, 0x69, 0x74,
-	0x70, 0x6f, 0x64, 0x2e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31,
-	0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74,
-	0x70, 0x6f, 0x64, 0x2d, 0x69, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2f, 0x63, 0x6f,
-	0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2d,
-	0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x8d, 0x01, 0x0a, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43,
+	0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e,
+	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x42, 0x51, 0x0a, 0x16, 0x69, 0x6f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x5a, 0x37,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2d, 0x69, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2f, 0x63, 0x6f, 0x6d, 0x70,
+	0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2d, 0x61, 0x70,
+	0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2697,7 +2837,7 @@ func file_gitpod_v1_organization_proto_rawDescGZIP() []byte {
 }
 
 var file_gitpod_v1_organization_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_gitpod_v1_organization_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
+var file_gitpod_v1_organization_proto_msgTypes = make([]protoimpl.MessageInfo, 37)
 var file_gitpod_v1_organization_proto_goTypes = []interface{}{
 	(OrganizationRole)(0),                            // 0: gitpod.v1.OrganizationRole
 	(OrganizationPermission)(0),                      // 1: gitpod.v1.OrganizationPermission
@@ -2736,79 +2876,81 @@ var file_gitpod_v1_organization_proto_goTypes = []interface{}{
 	(*UpdateOrganizationMemberResponse)(nil),         // 34: gitpod.v1.UpdateOrganizationMemberResponse
 	(*DeleteOrganizationMemberRequest)(nil),          // 35: gitpod.v1.DeleteOrganizationMemberRequest
 	(*DeleteOrganizationMemberResponse)(nil),         // 36: gitpod.v1.DeleteOrganizationMemberResponse
-	nil,                                              // 37: gitpod.v1.OrganizationSettings.PinnedEditorVersionsEntry
-	nil,                                              // 38: gitpod.v1.UpdateOrganizationSettingsRequest.PinnedEditorVersionsEntry
-	(*timestamppb.Timestamp)(nil),                    // 39: google.protobuf.Timestamp
-	(*PaginationRequest)(nil),                        // 40: gitpod.v1.PaginationRequest
-	(*PaginationResponse)(nil),                       // 41: gitpod.v1.PaginationResponse
-	(*WorkspaceClass)(nil),                           // 42: gitpod.v1.WorkspaceClass
-	(*durationpb.Duration)(nil),                      // 43: google.protobuf.Duration
+	(*OnboardingSettings_WelcomeMessage)(nil),        // 37: gitpod.v1.OnboardingSettings.WelcomeMessage
+	nil,                           // 38: gitpod.v1.OrganizationSettings.PinnedEditorVersionsEntry
+	nil,                           // 39: gitpod.v1.UpdateOrganizationSettingsRequest.PinnedEditorVersionsEntry
+	(*timestamppb.Timestamp)(nil), // 40: google.protobuf.Timestamp
+	(*PaginationRequest)(nil),     // 41: gitpod.v1.PaginationRequest
+	(*PaginationResponse)(nil),    // 42: gitpod.v1.PaginationResponse
+	(*WorkspaceClass)(nil),        // 43: gitpod.v1.WorkspaceClass
+	(*durationpb.Duration)(nil),   // 44: google.protobuf.Duration
 }
 var file_gitpod_v1_organization_proto_depIdxs = []int32{
-	39, // 0: gitpod.v1.Organization.creation_time:type_name -> google.protobuf.Timestamp
+	40, // 0: gitpod.v1.Organization.creation_time:type_name -> google.protobuf.Timestamp
 	0,  // 1: gitpod.v1.OrganizationMember.role:type_name -> gitpod.v1.OrganizationRole
-	39, // 2: gitpod.v1.OrganizationMember.member_since:type_name -> google.protobuf.Timestamp
+	40, // 2: gitpod.v1.OrganizationMember.member_since:type_name -> google.protobuf.Timestamp
 	0,  // 3: gitpod.v1.RoleRestrictionEntry.role:type_name -> gitpod.v1.OrganizationRole
 	1,  // 4: gitpod.v1.RoleRestrictionEntry.permissions:type_name -> gitpod.v1.OrganizationPermission
-	37, // 5: gitpod.v1.OrganizationSettings.pinned_editor_versions:type_name -> gitpod.v1.OrganizationSettings.PinnedEditorVersionsEntry
-	12, // 6: gitpod.v1.OrganizationSettings.timeout_settings:type_name -> gitpod.v1.TimeoutSettings
-	5,  // 7: gitpod.v1.OrganizationSettings.role_restrictions:type_name -> gitpod.v1.RoleRestrictionEntry
-	6,  // 8: gitpod.v1.OrganizationSettings.onboarding_settings:type_name -> gitpod.v1.OnboardingSettings
-	40, // 9: gitpod.v1.ListOrganizationWorkspaceClassesRequest.pagination:type_name -> gitpod.v1.PaginationRequest
-	41, // 10: gitpod.v1.ListOrganizationWorkspaceClassesResponse.pagination:type_name -> gitpod.v1.PaginationResponse
-	42, // 11: gitpod.v1.ListOrganizationWorkspaceClassesResponse.workspace_classes:type_name -> gitpod.v1.WorkspaceClass
-	3,  // 12: gitpod.v1.UpdateOrganizationResponse.organization:type_name -> gitpod.v1.Organization
-	43, // 13: gitpod.v1.TimeoutSettings.inactivity:type_name -> google.protobuf.Duration
-	38, // 14: gitpod.v1.UpdateOrganizationSettingsRequest.pinned_editor_versions:type_name -> gitpod.v1.UpdateOrganizationSettingsRequest.PinnedEditorVersionsEntry
-	12, // 15: gitpod.v1.UpdateOrganizationSettingsRequest.timeout_settings:type_name -> gitpod.v1.TimeoutSettings
-	5,  // 16: gitpod.v1.UpdateOrganizationSettingsRequest.role_restrictions:type_name -> gitpod.v1.RoleRestrictionEntry
-	6,  // 17: gitpod.v1.UpdateOrganizationSettingsRequest.onboarding_settings:type_name -> gitpod.v1.OnboardingSettings
-	7,  // 18: gitpod.v1.UpdateOrganizationSettingsResponse.settings:type_name -> gitpod.v1.OrganizationSettings
-	7,  // 19: gitpod.v1.GetOrganizationSettingsResponse.settings:type_name -> gitpod.v1.OrganizationSettings
-	3,  // 20: gitpod.v1.CreateOrganizationResponse.organization:type_name -> gitpod.v1.Organization
-	3,  // 21: gitpod.v1.GetOrganizationResponse.organization:type_name -> gitpod.v1.Organization
-	40, // 22: gitpod.v1.ListOrganizationsRequest.pagination:type_name -> gitpod.v1.PaginationRequest
-	2,  // 23: gitpod.v1.ListOrganizationsRequest.scope:type_name -> gitpod.v1.ListOrganizationsRequest.Scope
-	3,  // 24: gitpod.v1.ListOrganizationsResponse.organizations:type_name -> gitpod.v1.Organization
-	41, // 25: gitpod.v1.ListOrganizationsResponse.pagination:type_name -> gitpod.v1.PaginationResponse
-	40, // 26: gitpod.v1.ListOrganizationMembersRequest.pagination:type_name -> gitpod.v1.PaginationRequest
-	4,  // 27: gitpod.v1.ListOrganizationMembersResponse.members:type_name -> gitpod.v1.OrganizationMember
-	41, // 28: gitpod.v1.ListOrganizationMembersResponse.pagination:type_name -> gitpod.v1.PaginationResponse
-	0,  // 29: gitpod.v1.UpdateOrganizationMemberRequest.role:type_name -> gitpod.v1.OrganizationRole
-	4,  // 30: gitpod.v1.UpdateOrganizationMemberResponse.member:type_name -> gitpod.v1.OrganizationMember
-	17, // 31: gitpod.v1.OrganizationService.CreateOrganization:input_type -> gitpod.v1.CreateOrganizationRequest
-	19, // 32: gitpod.v1.OrganizationService.GetOrganization:input_type -> gitpod.v1.GetOrganizationRequest
-	10, // 33: gitpod.v1.OrganizationService.UpdateOrganization:input_type -> gitpod.v1.UpdateOrganizationRequest
-	21, // 34: gitpod.v1.OrganizationService.ListOrganizations:input_type -> gitpod.v1.ListOrganizationsRequest
-	23, // 35: gitpod.v1.OrganizationService.DeleteOrganization:input_type -> gitpod.v1.DeleteOrganizationRequest
-	25, // 36: gitpod.v1.OrganizationService.GetOrganizationInvitation:input_type -> gitpod.v1.GetOrganizationInvitationRequest
-	27, // 37: gitpod.v1.OrganizationService.JoinOrganization:input_type -> gitpod.v1.JoinOrganizationRequest
-	29, // 38: gitpod.v1.OrganizationService.ResetOrganizationInvitation:input_type -> gitpod.v1.ResetOrganizationInvitationRequest
-	31, // 39: gitpod.v1.OrganizationService.ListOrganizationMembers:input_type -> gitpod.v1.ListOrganizationMembersRequest
-	33, // 40: gitpod.v1.OrganizationService.UpdateOrganizationMember:input_type -> gitpod.v1.UpdateOrganizationMemberRequest
-	35, // 41: gitpod.v1.OrganizationService.DeleteOrganizationMember:input_type -> gitpod.v1.DeleteOrganizationMemberRequest
-	15, // 42: gitpod.v1.OrganizationService.GetOrganizationSettings:input_type -> gitpod.v1.GetOrganizationSettingsRequest
-	13, // 43: gitpod.v1.OrganizationService.UpdateOrganizationSettings:input_type -> gitpod.v1.UpdateOrganizationSettingsRequest
-	8,  // 44: gitpod.v1.OrganizationService.ListOrganizationWorkspaceClasses:input_type -> gitpod.v1.ListOrganizationWorkspaceClassesRequest
-	18, // 45: gitpod.v1.OrganizationService.CreateOrganization:output_type -> gitpod.v1.CreateOrganizationResponse
-	20, // 46: gitpod.v1.OrganizationService.GetOrganization:output_type -> gitpod.v1.GetOrganizationResponse
-	11, // 47: gitpod.v1.OrganizationService.UpdateOrganization:output_type -> gitpod.v1.UpdateOrganizationResponse
-	22, // 48: gitpod.v1.OrganizationService.ListOrganizations:output_type -> gitpod.v1.ListOrganizationsResponse
-	24, // 49: gitpod.v1.OrganizationService.DeleteOrganization:output_type -> gitpod.v1.DeleteOrganizationResponse
-	26, // 50: gitpod.v1.OrganizationService.GetOrganizationInvitation:output_type -> gitpod.v1.GetOrganizationInvitationResponse
-	28, // 51: gitpod.v1.OrganizationService.JoinOrganization:output_type -> gitpod.v1.JoinOrganizationResponse
-	30, // 52: gitpod.v1.OrganizationService.ResetOrganizationInvitation:output_type -> gitpod.v1.ResetOrganizationInvitationResponse
-	32, // 53: gitpod.v1.OrganizationService.ListOrganizationMembers:output_type -> gitpod.v1.ListOrganizationMembersResponse
-	34, // 54: gitpod.v1.OrganizationService.UpdateOrganizationMember:output_type -> gitpod.v1.UpdateOrganizationMemberResponse
-	36, // 55: gitpod.v1.OrganizationService.DeleteOrganizationMember:output_type -> gitpod.v1.DeleteOrganizationMemberResponse
-	16, // 56: gitpod.v1.OrganizationService.GetOrganizationSettings:output_type -> gitpod.v1.GetOrganizationSettingsResponse
-	14, // 57: gitpod.v1.OrganizationService.UpdateOrganizationSettings:output_type -> gitpod.v1.UpdateOrganizationSettingsResponse
-	9,  // 58: gitpod.v1.OrganizationService.ListOrganizationWorkspaceClasses:output_type -> gitpod.v1.ListOrganizationWorkspaceClassesResponse
-	45, // [45:59] is the sub-list for method output_type
-	31, // [31:45] is the sub-list for method input_type
-	31, // [31:31] is the sub-list for extension type_name
-	31, // [31:31] is the sub-list for extension extendee
-	0,  // [0:31] is the sub-list for field type_name
+	37, // 5: gitpod.v1.OnboardingSettings.welcome_message:type_name -> gitpod.v1.OnboardingSettings.WelcomeMessage
+	38, // 6: gitpod.v1.OrganizationSettings.pinned_editor_versions:type_name -> gitpod.v1.OrganizationSettings.PinnedEditorVersionsEntry
+	12, // 7: gitpod.v1.OrganizationSettings.timeout_settings:type_name -> gitpod.v1.TimeoutSettings
+	5,  // 8: gitpod.v1.OrganizationSettings.role_restrictions:type_name -> gitpod.v1.RoleRestrictionEntry
+	6,  // 9: gitpod.v1.OrganizationSettings.onboarding_settings:type_name -> gitpod.v1.OnboardingSettings
+	41, // 10: gitpod.v1.ListOrganizationWorkspaceClassesRequest.pagination:type_name -> gitpod.v1.PaginationRequest
+	42, // 11: gitpod.v1.ListOrganizationWorkspaceClassesResponse.pagination:type_name -> gitpod.v1.PaginationResponse
+	43, // 12: gitpod.v1.ListOrganizationWorkspaceClassesResponse.workspace_classes:type_name -> gitpod.v1.WorkspaceClass
+	3,  // 13: gitpod.v1.UpdateOrganizationResponse.organization:type_name -> gitpod.v1.Organization
+	44, // 14: gitpod.v1.TimeoutSettings.inactivity:type_name -> google.protobuf.Duration
+	39, // 15: gitpod.v1.UpdateOrganizationSettingsRequest.pinned_editor_versions:type_name -> gitpod.v1.UpdateOrganizationSettingsRequest.PinnedEditorVersionsEntry
+	12, // 16: gitpod.v1.UpdateOrganizationSettingsRequest.timeout_settings:type_name -> gitpod.v1.TimeoutSettings
+	5,  // 17: gitpod.v1.UpdateOrganizationSettingsRequest.role_restrictions:type_name -> gitpod.v1.RoleRestrictionEntry
+	6,  // 18: gitpod.v1.UpdateOrganizationSettingsRequest.onboarding_settings:type_name -> gitpod.v1.OnboardingSettings
+	7,  // 19: gitpod.v1.UpdateOrganizationSettingsResponse.settings:type_name -> gitpod.v1.OrganizationSettings
+	7,  // 20: gitpod.v1.GetOrganizationSettingsResponse.settings:type_name -> gitpod.v1.OrganizationSettings
+	3,  // 21: gitpod.v1.CreateOrganizationResponse.organization:type_name -> gitpod.v1.Organization
+	3,  // 22: gitpod.v1.GetOrganizationResponse.organization:type_name -> gitpod.v1.Organization
+	41, // 23: gitpod.v1.ListOrganizationsRequest.pagination:type_name -> gitpod.v1.PaginationRequest
+	2,  // 24: gitpod.v1.ListOrganizationsRequest.scope:type_name -> gitpod.v1.ListOrganizationsRequest.Scope
+	3,  // 25: gitpod.v1.ListOrganizationsResponse.organizations:type_name -> gitpod.v1.Organization
+	42, // 26: gitpod.v1.ListOrganizationsResponse.pagination:type_name -> gitpod.v1.PaginationResponse
+	41, // 27: gitpod.v1.ListOrganizationMembersRequest.pagination:type_name -> gitpod.v1.PaginationRequest
+	4,  // 28: gitpod.v1.ListOrganizationMembersResponse.members:type_name -> gitpod.v1.OrganizationMember
+	42, // 29: gitpod.v1.ListOrganizationMembersResponse.pagination:type_name -> gitpod.v1.PaginationResponse
+	0,  // 30: gitpod.v1.UpdateOrganizationMemberRequest.role:type_name -> gitpod.v1.OrganizationRole
+	4,  // 31: gitpod.v1.UpdateOrganizationMemberResponse.member:type_name -> gitpod.v1.OrganizationMember
+	17, // 32: gitpod.v1.OrganizationService.CreateOrganization:input_type -> gitpod.v1.CreateOrganizationRequest
+	19, // 33: gitpod.v1.OrganizationService.GetOrganization:input_type -> gitpod.v1.GetOrganizationRequest
+	10, // 34: gitpod.v1.OrganizationService.UpdateOrganization:input_type -> gitpod.v1.UpdateOrganizationRequest
+	21, // 35: gitpod.v1.OrganizationService.ListOrganizations:input_type -> gitpod.v1.ListOrganizationsRequest
+	23, // 36: gitpod.v1.OrganizationService.DeleteOrganization:input_type -> gitpod.v1.DeleteOrganizationRequest
+	25, // 37: gitpod.v1.OrganizationService.GetOrganizationInvitation:input_type -> gitpod.v1.GetOrganizationInvitationRequest
+	27, // 38: gitpod.v1.OrganizationService.JoinOrganization:input_type -> gitpod.v1.JoinOrganizationRequest
+	29, // 39: gitpod.v1.OrganizationService.ResetOrganizationInvitation:input_type -> gitpod.v1.ResetOrganizationInvitationRequest
+	31, // 40: gitpod.v1.OrganizationService.ListOrganizationMembers:input_type -> gitpod.v1.ListOrganizationMembersRequest
+	33, // 41: gitpod.v1.OrganizationService.UpdateOrganizationMember:input_type -> gitpod.v1.UpdateOrganizationMemberRequest
+	35, // 42: gitpod.v1.OrganizationService.DeleteOrganizationMember:input_type -> gitpod.v1.DeleteOrganizationMemberRequest
+	15, // 43: gitpod.v1.OrganizationService.GetOrganizationSettings:input_type -> gitpod.v1.GetOrganizationSettingsRequest
+	13, // 44: gitpod.v1.OrganizationService.UpdateOrganizationSettings:input_type -> gitpod.v1.UpdateOrganizationSettingsRequest
+	8,  // 45: gitpod.v1.OrganizationService.ListOrganizationWorkspaceClasses:input_type -> gitpod.v1.ListOrganizationWorkspaceClassesRequest
+	18, // 46: gitpod.v1.OrganizationService.CreateOrganization:output_type -> gitpod.v1.CreateOrganizationResponse
+	20, // 47: gitpod.v1.OrganizationService.GetOrganization:output_type -> gitpod.v1.GetOrganizationResponse
+	11, // 48: gitpod.v1.OrganizationService.UpdateOrganization:output_type -> gitpod.v1.UpdateOrganizationResponse
+	22, // 49: gitpod.v1.OrganizationService.ListOrganizations:output_type -> gitpod.v1.ListOrganizationsResponse
+	24, // 50: gitpod.v1.OrganizationService.DeleteOrganization:output_type -> gitpod.v1.DeleteOrganizationResponse
+	26, // 51: gitpod.v1.OrganizationService.GetOrganizationInvitation:output_type -> gitpod.v1.GetOrganizationInvitationResponse
+	28, // 52: gitpod.v1.OrganizationService.JoinOrganization:output_type -> gitpod.v1.JoinOrganizationResponse
+	30, // 53: gitpod.v1.OrganizationService.ResetOrganizationInvitation:output_type -> gitpod.v1.ResetOrganizationInvitationResponse
+	32, // 54: gitpod.v1.OrganizationService.ListOrganizationMembers:output_type -> gitpod.v1.ListOrganizationMembersResponse
+	34, // 55: gitpod.v1.OrganizationService.UpdateOrganizationMember:output_type -> gitpod.v1.UpdateOrganizationMemberResponse
+	36, // 56: gitpod.v1.OrganizationService.DeleteOrganizationMember:output_type -> gitpod.v1.DeleteOrganizationMemberResponse
+	16, // 57: gitpod.v1.OrganizationService.GetOrganizationSettings:output_type -> gitpod.v1.GetOrganizationSettingsResponse
+	14, // 58: gitpod.v1.OrganizationService.UpdateOrganizationSettings:output_type -> gitpod.v1.UpdateOrganizationSettingsResponse
+	9,  // 59: gitpod.v1.OrganizationService.ListOrganizationWorkspaceClasses:output_type -> gitpod.v1.ListOrganizationWorkspaceClassesResponse
+	46, // [46:60] is the sub-list for method output_type
+	32, // [32:46] is the sub-list for method input_type
+	32, // [32:32] is the sub-list for extension type_name
+	32, // [32:32] is the sub-list for extension extendee
+	0,  // [0:32] is the sub-list for field type_name
 }
 
 func init() { file_gitpod_v1_organization_proto_init() }
@@ -3227,19 +3369,32 @@ func file_gitpod_v1_organization_proto_init() {
 				return nil
 			}
 		}
+		file_gitpod_v1_organization_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OnboardingSettings_WelcomeMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	file_gitpod_v1_organization_proto_msgTypes[3].OneofWrappers = []interface{}{}
 	file_gitpod_v1_organization_proto_msgTypes[7].OneofWrappers = []interface{}{}
 	file_gitpod_v1_organization_proto_msgTypes[9].OneofWrappers = []interface{}{}
 	file_gitpod_v1_organization_proto_msgTypes[10].OneofWrappers = []interface{}{}
 	file_gitpod_v1_organization_proto_msgTypes[30].OneofWrappers = []interface{}{}
+	file_gitpod_v1_organization_proto_msgTypes[34].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_gitpod_v1_organization_proto_rawDesc,
 			NumEnums:      3,
-			NumMessages:   36,
+			NumMessages:   37,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java b/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java
index 9788daa71aaa87..11bac324f3ab7e 100644
--- a/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java
+++ b/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java
@@ -166,7 +166,8 @@ private OrganizationRole(int value) {
 
   /**
    * <pre>
-   * OrganizationPermissions define permissions that are restrictable using RoleRestrictions
+   * OrganizationPermissions define permissions that are restrictable using
+   * RoleRestrictions
    * </pre>
    *
    * Protobuf enum {@code gitpod.v1.OrganizationPermission}
@@ -3527,7 +3528,9 @@ public interface OnboardingSettingsOrBuilder extends
 
     /**
      * <pre>
-     * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+     * internal_link is the link to an internal onboarding page for the
+     * organization, possibly featuring a custom onboarding guide and other
+     * resources
      * </pre>
      *
      * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -3536,7 +3539,9 @@ public interface OnboardingSettingsOrBuilder extends
     boolean hasInternalLink();
     /**
      * <pre>
-     * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+     * internal_link is the link to an internal onboarding page for the
+     * organization, possibly featuring a custom onboarding guide and other
+     * resources
      * </pre>
      *
      * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -3545,7 +3550,9 @@ public interface OnboardingSettingsOrBuilder extends
     java.lang.String getInternalLink();
     /**
      * <pre>
-     * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+     * internal_link is the link to an internal onboarding page for the
+     * organization, possibly featuring a custom onboarding guide and other
+     * resources
      * </pre>
      *
      * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -3556,7 +3563,8 @@ public interface OnboardingSettingsOrBuilder extends
 
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3566,7 +3574,8 @@ public interface OnboardingSettingsOrBuilder extends
         getRecommendedRepositoriesList();
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3575,7 +3584,8 @@ public interface OnboardingSettingsOrBuilder extends
     int getRecommendedRepositoriesCount();
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3585,7 +3595,8 @@ public interface OnboardingSettingsOrBuilder extends
     java.lang.String getRecommendedRepositories(int index);
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3594,8 +3605,62 @@ public interface OnboardingSettingsOrBuilder extends
      */
     com.google.protobuf.ByteString
         getRecommendedRepositoriesBytes(int index);
+
+    /**
+     * <pre>
+     * update_recommended_repositories specifies whether recommended_repositories
+     * should be updated.
+     * This field **will not** be specified in server responses.
+     * </pre>
+     *
+     * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+     * @return Whether the updateRecommendedRepositories field is set.
+     */
+    boolean hasUpdateRecommendedRepositories();
+    /**
+     * <pre>
+     * update_recommended_repositories specifies whether recommended_repositories
+     * should be updated.
+     * This field **will not** be specified in server responses.
+     * </pre>
+     *
+     * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+     * @return The updateRecommendedRepositories.
+     */
+    boolean getUpdateRecommendedRepositories();
+
+    /**
+     * <pre>
+     * welcome_message is the welcome message for the organization
+     * </pre>
+     *
+     * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+     * @return Whether the welcomeMessage field is set.
+     */
+    boolean hasWelcomeMessage();
+    /**
+     * <pre>
+     * welcome_message is the welcome message for the organization
+     * </pre>
+     *
+     * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+     * @return The welcomeMessage.
+     */
+    io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage getWelcomeMessage();
+    /**
+     * <pre>
+     * welcome_message is the welcome message for the organization
+     * </pre>
+     *
+     * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+     */
+    io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder getWelcomeMessageOrBuilder();
   }
   /**
+   * <pre>
+   * onboarding_settings are the settings for the organization's onboarding
+   * </pre>
+   *
    * Protobuf type {@code gitpod.v1.OnboardingSettings}
    */
   public static final class OnboardingSettings extends
@@ -3622,17 +3687,1165 @@ private OnboardingSettings() {
           com.google.protobuf.LazyStringArrayList.emptyList();
     }
 
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_descriptor;
-    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.class, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.Builder.class);
+    }
+
+    public interface WelcomeMessageOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:gitpod.v1.OnboardingSettings.WelcomeMessage)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       * <pre>
+       * enabled specifies whether the welcome message is enabled
+       * </pre>
+       *
+       * <code>bool enabled = 1 [json_name = "enabled"];</code>
+       * @return The enabled.
+       */
+      boolean getEnabled();
+
+      /**
+       * <pre>
+       * message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional string message = 2 [json_name = "message"];</code>
+       * @return Whether the message field is set.
+       */
+      boolean hasMessage();
+      /**
+       * <pre>
+       * message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional string message = 2 [json_name = "message"];</code>
+       * @return The message.
+       */
+      java.lang.String getMessage();
+      /**
+       * <pre>
+       * message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional string message = 2 [json_name = "message"];</code>
+       * @return The bytes for message.
+       */
+      com.google.protobuf.ByteString
+          getMessageBytes();
+
+      /**
+       * <pre>
+       * featured_member_id is the ID of the member to show in the welcome message
+       * </pre>
+       *
+       * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+       * @return Whether the featuredMemberId field is set.
+       */
+      boolean hasFeaturedMemberId();
+      /**
+       * <pre>
+       * featured_member_id is the ID of the member to show in the welcome message
+       * </pre>
+       *
+       * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+       * @return The featuredMemberId.
+       */
+      java.lang.String getFeaturedMemberId();
+      /**
+       * <pre>
+       * featured_member_id is the ID of the member to show in the welcome message
+       * </pre>
+       *
+       * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+       * @return The bytes for featuredMemberId.
+       */
+      com.google.protobuf.ByteString
+          getFeaturedMemberIdBytes();
+
+      /**
+       * <pre>
+       * featured_member_resolved_avatar_url is the avatar URL that is resolved
+       * from the featured_member_id by the server
+       * This field **can not** be set in the request.
+       * </pre>
+       *
+       * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+       * @return Whether the featuredMemberResolvedAvatarUrl field is set.
+       */
+      boolean hasFeaturedMemberResolvedAvatarUrl();
+      /**
+       * <pre>
+       * featured_member_resolved_avatar_url is the avatar URL that is resolved
+       * from the featured_member_id by the server
+       * This field **can not** be set in the request.
+       * </pre>
+       *
+       * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+       * @return The featuredMemberResolvedAvatarUrl.
+       */
+      java.lang.String getFeaturedMemberResolvedAvatarUrl();
+      /**
+       * <pre>
+       * featured_member_resolved_avatar_url is the avatar URL that is resolved
+       * from the featured_member_id by the server
+       * This field **can not** be set in the request.
+       * </pre>
+       *
+       * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+       * @return The bytes for featuredMemberResolvedAvatarUrl.
+       */
+      com.google.protobuf.ByteString
+          getFeaturedMemberResolvedAvatarUrlBytes();
+    }
+    /**
+     * Protobuf type {@code gitpod.v1.OnboardingSettings.WelcomeMessage}
+     */
+    public static final class WelcomeMessage extends
+        com.google.protobuf.GeneratedMessage implements
+        // @@protoc_insertion_point(message_implements:gitpod.v1.OnboardingSettings.WelcomeMessage)
+        WelcomeMessageOrBuilder {
+    private static final long serialVersionUID = 0L;
+      static {
+        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+          com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+          /* major= */ 4,
+          /* minor= */ 27,
+          /* patch= */ 2,
+          /* suffix= */ "",
+          WelcomeMessage.class.getName());
+      }
+      // Use WelcomeMessage.newBuilder() to construct.
+      private WelcomeMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+        super(builder);
+      }
+      private WelcomeMessage() {
+        message_ = "";
+        featuredMemberId_ = "";
+        featuredMemberResolvedAvatarUrl_ = "";
+      }
+
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.class, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder.class);
+      }
+
+      private int bitField0_;
+      public static final int ENABLED_FIELD_NUMBER = 1;
+      private boolean enabled_ = false;
+      /**
+       * <pre>
+       * enabled specifies whether the welcome message is enabled
+       * </pre>
+       *
+       * <code>bool enabled = 1 [json_name = "enabled"];</code>
+       * @return The enabled.
+       */
+      @java.lang.Override
+      public boolean getEnabled() {
+        return enabled_;
+      }
+
+      public static final int MESSAGE_FIELD_NUMBER = 2;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object message_ = "";
+      /**
+       * <pre>
+       * message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional string message = 2 [json_name = "message"];</code>
+       * @return Whether the message field is set.
+       */
+      @java.lang.Override
+      public boolean hasMessage() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * <pre>
+       * message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional string message = 2 [json_name = "message"];</code>
+       * @return The message.
+       */
+      @java.lang.Override
+      public java.lang.String getMessage() {
+        java.lang.Object ref = message_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          message_ = s;
+          return s;
+        }
+      }
+      /**
+       * <pre>
+       * message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional string message = 2 [json_name = "message"];</code>
+       * @return The bytes for message.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getMessageBytes() {
+        java.lang.Object ref = message_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          message_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      public static final int FEATURED_MEMBER_ID_FIELD_NUMBER = 4;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object featuredMemberId_ = "";
+      /**
+       * <pre>
+       * featured_member_id is the ID of the member to show in the welcome message
+       * </pre>
+       *
+       * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+       * @return Whether the featuredMemberId field is set.
+       */
+      @java.lang.Override
+      public boolean hasFeaturedMemberId() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * <pre>
+       * featured_member_id is the ID of the member to show in the welcome message
+       * </pre>
+       *
+       * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+       * @return The featuredMemberId.
+       */
+      @java.lang.Override
+      public java.lang.String getFeaturedMemberId() {
+        java.lang.Object ref = featuredMemberId_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          featuredMemberId_ = s;
+          return s;
+        }
+      }
+      /**
+       * <pre>
+       * featured_member_id is the ID of the member to show in the welcome message
+       * </pre>
+       *
+       * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+       * @return The bytes for featuredMemberId.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getFeaturedMemberIdBytes() {
+        java.lang.Object ref = featuredMemberId_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          featuredMemberId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      public static final int FEATURED_MEMBER_RESOLVED_AVATAR_URL_FIELD_NUMBER = 5;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object featuredMemberResolvedAvatarUrl_ = "";
+      /**
+       * <pre>
+       * featured_member_resolved_avatar_url is the avatar URL that is resolved
+       * from the featured_member_id by the server
+       * This field **can not** be set in the request.
+       * </pre>
+       *
+       * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+       * @return Whether the featuredMemberResolvedAvatarUrl field is set.
+       */
+      @java.lang.Override
+      public boolean hasFeaturedMemberResolvedAvatarUrl() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * <pre>
+       * featured_member_resolved_avatar_url is the avatar URL that is resolved
+       * from the featured_member_id by the server
+       * This field **can not** be set in the request.
+       * </pre>
+       *
+       * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+       * @return The featuredMemberResolvedAvatarUrl.
+       */
+      @java.lang.Override
+      public java.lang.String getFeaturedMemberResolvedAvatarUrl() {
+        java.lang.Object ref = featuredMemberResolvedAvatarUrl_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          featuredMemberResolvedAvatarUrl_ = s;
+          return s;
+        }
+      }
+      /**
+       * <pre>
+       * featured_member_resolved_avatar_url is the avatar URL that is resolved
+       * from the featured_member_id by the server
+       * This field **can not** be set in the request.
+       * </pre>
+       *
+       * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+       * @return The bytes for featuredMemberResolvedAvatarUrl.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getFeaturedMemberResolvedAvatarUrlBytes() {
+        java.lang.Object ref = featuredMemberResolvedAvatarUrl_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b =
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          featuredMemberResolvedAvatarUrl_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      private byte memoizedIsInitialized = -1;
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        if (enabled_ != false) {
+          output.writeBool(1, enabled_);
+        }
+        if (((bitField0_ & 0x00000001) != 0)) {
+          com.google.protobuf.GeneratedMessage.writeString(output, 2, message_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          com.google.protobuf.GeneratedMessage.writeString(output, 4, featuredMemberId_);
+        }
+        if (((bitField0_ & 0x00000004) != 0)) {
+          com.google.protobuf.GeneratedMessage.writeString(output, 5, featuredMemberResolvedAvatarUrl_);
+        }
+        getUnknownFields().writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (enabled_ != false) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeBoolSize(1, enabled_);
+        }
+        if (((bitField0_ & 0x00000001) != 0)) {
+          size += com.google.protobuf.GeneratedMessage.computeStringSize(2, message_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          size += com.google.protobuf.GeneratedMessage.computeStringSize(4, featuredMemberId_);
+        }
+        if (((bitField0_ & 0x00000004) != 0)) {
+          size += com.google.protobuf.GeneratedMessage.computeStringSize(5, featuredMemberResolvedAvatarUrl_);
+        }
+        size += getUnknownFields().getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+         return true;
+        }
+        if (!(obj instanceof io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage)) {
+          return super.equals(obj);
+        }
+        io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage other = (io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage) obj;
+
+        if (getEnabled()
+            != other.getEnabled()) return false;
+        if (hasMessage() != other.hasMessage()) return false;
+        if (hasMessage()) {
+          if (!getMessage()
+              .equals(other.getMessage())) return false;
+        }
+        if (hasFeaturedMemberId() != other.hasFeaturedMemberId()) return false;
+        if (hasFeaturedMemberId()) {
+          if (!getFeaturedMemberId()
+              .equals(other.getFeaturedMemberId())) return false;
+        }
+        if (hasFeaturedMemberResolvedAvatarUrl() != other.hasFeaturedMemberResolvedAvatarUrl()) return false;
+        if (hasFeaturedMemberResolvedAvatarUrl()) {
+          if (!getFeaturedMemberResolvedAvatarUrl()
+              .equals(other.getFeaturedMemberResolvedAvatarUrl())) return false;
+        }
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        hash = (37 * hash) + ENABLED_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getEnabled());
+        if (hasMessage()) {
+          hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
+          hash = (53 * hash) + getMessage().hashCode();
+        }
+        if (hasFeaturedMemberId()) {
+          hash = (37 * hash) + FEATURED_MEMBER_ID_FIELD_NUMBER;
+          hash = (53 * hash) + getFeaturedMemberId().hashCode();
+        }
+        if (hasFeaturedMemberResolvedAvatarUrl()) {
+          hash = (37 * hash) + FEATURED_MEMBER_RESOLVED_AVATAR_URL_FIELD_NUMBER;
+          hash = (53 * hash) + getFeaturedMemberResolvedAvatarUrl().hashCode();
+        }
+        hash = (29 * hash) + getUnknownFields().hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input);
+      }
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessage
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+      public static Builder newBuilder(io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       * Protobuf type {@code gitpod.v1.OnboardingSettings.WelcomeMessage}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+          // @@protoc_insertion_point(builder_implements:gitpod.v1.OnboardingSettings.WelcomeMessage)
+          io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_descriptor;
+        }
+
+        @java.lang.Override
+        protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.class, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder.class);
+        }
+
+        // Construct using io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.newBuilder()
+        private Builder() {
+
+        }
+
+        private Builder(
+            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          super(parent);
+
+        }
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          bitField0_ = 0;
+          enabled_ = false;
+          message_ = "";
+          featuredMemberId_ = "";
+          featuredMemberResolvedAvatarUrl_ = "";
+          return this;
+        }
+
+        @java.lang.Override
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_descriptor;
+        }
+
+        @java.lang.Override
+        public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage getDefaultInstanceForType() {
+          return io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage build() {
+          io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage buildPartial() {
+          io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage result = new io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage result) {
+          int from_bitField0_ = bitField0_;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.enabled_ = enabled_;
+          }
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.message_ = message_;
+            to_bitField0_ |= 0x00000001;
+          }
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.featuredMemberId_ = featuredMemberId_;
+            to_bitField0_ |= 0x00000002;
+          }
+          if (((from_bitField0_ & 0x00000008) != 0)) {
+            result.featuredMemberResolvedAvatarUrl_ = featuredMemberResolvedAvatarUrl_;
+            to_bitField0_ |= 0x00000004;
+          }
+          result.bitField0_ |= to_bitField0_;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage) {
+            return mergeFrom((io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage other) {
+          if (other == io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance()) return this;
+          if (other.getEnabled() != false) {
+            setEnabled(other.getEnabled());
+          }
+          if (other.hasMessage()) {
+            message_ = other.message_;
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
+          if (other.hasFeaturedMemberId()) {
+            featuredMemberId_ = other.featuredMemberId_;
+            bitField0_ |= 0x00000004;
+            onChanged();
+          }
+          if (other.hasFeaturedMemberResolvedAvatarUrl()) {
+            featuredMemberResolvedAvatarUrl_ = other.featuredMemberResolvedAvatarUrl_;
+            bitField0_ |= 0x00000008;
+            onChanged();
+          }
+          this.mergeUnknownFields(other.getUnknownFields());
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
+          try {
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  enabled_ = input.readBool();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  message_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 34: {
+                  featuredMemberId_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 34
+                case 42: {
+                  featuredMemberResolvedAvatarUrl_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 42
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.unwrapIOException();
+          } finally {
+            onChanged();
+          } // finally
+          return this;
+        }
+        private int bitField0_;
+
+        private boolean enabled_ ;
+        /**
+         * <pre>
+         * enabled specifies whether the welcome message is enabled
+         * </pre>
+         *
+         * <code>bool enabled = 1 [json_name = "enabled"];</code>
+         * @return The enabled.
+         */
+        @java.lang.Override
+        public boolean getEnabled() {
+          return enabled_;
+        }
+        /**
+         * <pre>
+         * enabled specifies whether the welcome message is enabled
+         * </pre>
+         *
+         * <code>bool enabled = 1 [json_name = "enabled"];</code>
+         * @param value The enabled to set.
+         * @return This builder for chaining.
+         */
+        public Builder setEnabled(boolean value) {
+
+          enabled_ = value;
+          bitField0_ |= 0x00000001;
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * enabled specifies whether the welcome message is enabled
+         * </pre>
+         *
+         * <code>bool enabled = 1 [json_name = "enabled"];</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearEnabled() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          enabled_ = false;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object message_ = "";
+        /**
+         * <pre>
+         * message is the welcome message for the organization
+         * </pre>
+         *
+         * <code>optional string message = 2 [json_name = "message"];</code>
+         * @return Whether the message field is set.
+         */
+        public boolean hasMessage() {
+          return ((bitField0_ & 0x00000002) != 0);
+        }
+        /**
+         * <pre>
+         * message is the welcome message for the organization
+         * </pre>
+         *
+         * <code>optional string message = 2 [json_name = "message"];</code>
+         * @return The message.
+         */
+        public java.lang.String getMessage() {
+          java.lang.Object ref = message_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            message_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * <pre>
+         * message is the welcome message for the organization
+         * </pre>
+         *
+         * <code>optional string message = 2 [json_name = "message"];</code>
+         * @return The bytes for message.
+         */
+        public com.google.protobuf.ByteString
+            getMessageBytes() {
+          java.lang.Object ref = message_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b =
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            message_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * <pre>
+         * message is the welcome message for the organization
+         * </pre>
+         *
+         * <code>optional string message = 2 [json_name = "message"];</code>
+         * @param value The message to set.
+         * @return This builder for chaining.
+         */
+        public Builder setMessage(
+            java.lang.String value) {
+          if (value == null) { throw new NullPointerException(); }
+          message_ = value;
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * message is the welcome message for the organization
+         * </pre>
+         *
+         * <code>optional string message = 2 [json_name = "message"];</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearMessage() {
+          message_ = getDefaultInstance().getMessage();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * message is the welcome message for the organization
+         * </pre>
+         *
+         * <code>optional string message = 2 [json_name = "message"];</code>
+         * @param value The bytes for message to set.
+         * @return This builder for chaining.
+         */
+        public Builder setMessageBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) { throw new NullPointerException(); }
+          checkByteStringIsUtf8(value);
+          message_ = value;
+          bitField0_ |= 0x00000002;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object featuredMemberId_ = "";
+        /**
+         * <pre>
+         * featured_member_id is the ID of the member to show in the welcome message
+         * </pre>
+         *
+         * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+         * @return Whether the featuredMemberId field is set.
+         */
+        public boolean hasFeaturedMemberId() {
+          return ((bitField0_ & 0x00000004) != 0);
+        }
+        /**
+         * <pre>
+         * featured_member_id is the ID of the member to show in the welcome message
+         * </pre>
+         *
+         * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+         * @return The featuredMemberId.
+         */
+        public java.lang.String getFeaturedMemberId() {
+          java.lang.Object ref = featuredMemberId_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            featuredMemberId_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * <pre>
+         * featured_member_id is the ID of the member to show in the welcome message
+         * </pre>
+         *
+         * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+         * @return The bytes for featuredMemberId.
+         */
+        public com.google.protobuf.ByteString
+            getFeaturedMemberIdBytes() {
+          java.lang.Object ref = featuredMemberId_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b =
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            featuredMemberId_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * <pre>
+         * featured_member_id is the ID of the member to show in the welcome message
+         * </pre>
+         *
+         * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+         * @param value The featuredMemberId to set.
+         * @return This builder for chaining.
+         */
+        public Builder setFeaturedMemberId(
+            java.lang.String value) {
+          if (value == null) { throw new NullPointerException(); }
+          featuredMemberId_ = value;
+          bitField0_ |= 0x00000004;
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * featured_member_id is the ID of the member to show in the welcome message
+         * </pre>
+         *
+         * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearFeaturedMemberId() {
+          featuredMemberId_ = getDefaultInstance().getFeaturedMemberId();
+          bitField0_ = (bitField0_ & ~0x00000004);
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * featured_member_id is the ID of the member to show in the welcome message
+         * </pre>
+         *
+         * <code>optional string featured_member_id = 4 [json_name = "featuredMemberId"];</code>
+         * @param value The bytes for featuredMemberId to set.
+         * @return This builder for chaining.
+         */
+        public Builder setFeaturedMemberIdBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) { throw new NullPointerException(); }
+          checkByteStringIsUtf8(value);
+          featuredMemberId_ = value;
+          bitField0_ |= 0x00000004;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object featuredMemberResolvedAvatarUrl_ = "";
+        /**
+         * <pre>
+         * featured_member_resolved_avatar_url is the avatar URL that is resolved
+         * from the featured_member_id by the server
+         * This field **can not** be set in the request.
+         * </pre>
+         *
+         * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+         * @return Whether the featuredMemberResolvedAvatarUrl field is set.
+         */
+        public boolean hasFeaturedMemberResolvedAvatarUrl() {
+          return ((bitField0_ & 0x00000008) != 0);
+        }
+        /**
+         * <pre>
+         * featured_member_resolved_avatar_url is the avatar URL that is resolved
+         * from the featured_member_id by the server
+         * This field **can not** be set in the request.
+         * </pre>
+         *
+         * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+         * @return The featuredMemberResolvedAvatarUrl.
+         */
+        public java.lang.String getFeaturedMemberResolvedAvatarUrl() {
+          java.lang.Object ref = featuredMemberResolvedAvatarUrl_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            featuredMemberResolvedAvatarUrl_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * <pre>
+         * featured_member_resolved_avatar_url is the avatar URL that is resolved
+         * from the featured_member_id by the server
+         * This field **can not** be set in the request.
+         * </pre>
+         *
+         * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+         * @return The bytes for featuredMemberResolvedAvatarUrl.
+         */
+        public com.google.protobuf.ByteString
+            getFeaturedMemberResolvedAvatarUrlBytes() {
+          java.lang.Object ref = featuredMemberResolvedAvatarUrl_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b =
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            featuredMemberResolvedAvatarUrl_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * <pre>
+         * featured_member_resolved_avatar_url is the avatar URL that is resolved
+         * from the featured_member_id by the server
+         * This field **can not** be set in the request.
+         * </pre>
+         *
+         * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+         * @param value The featuredMemberResolvedAvatarUrl to set.
+         * @return This builder for chaining.
+         */
+        public Builder setFeaturedMemberResolvedAvatarUrl(
+            java.lang.String value) {
+          if (value == null) { throw new NullPointerException(); }
+          featuredMemberResolvedAvatarUrl_ = value;
+          bitField0_ |= 0x00000008;
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * featured_member_resolved_avatar_url is the avatar URL that is resolved
+         * from the featured_member_id by the server
+         * This field **can not** be set in the request.
+         * </pre>
+         *
+         * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearFeaturedMemberResolvedAvatarUrl() {
+          featuredMemberResolvedAvatarUrl_ = getDefaultInstance().getFeaturedMemberResolvedAvatarUrl();
+          bitField0_ = (bitField0_ & ~0x00000008);
+          onChanged();
+          return this;
+        }
+        /**
+         * <pre>
+         * featured_member_resolved_avatar_url is the avatar URL that is resolved
+         * from the featured_member_id by the server
+         * This field **can not** be set in the request.
+         * </pre>
+         *
+         * <code>optional string featured_member_resolved_avatar_url = 5 [json_name = "featuredMemberResolvedAvatarUrl"];</code>
+         * @param value The bytes for featuredMemberResolvedAvatarUrl to set.
+         * @return This builder for chaining.
+         */
+        public Builder setFeaturedMemberResolvedAvatarUrlBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) { throw new NullPointerException(); }
+          checkByteStringIsUtf8(value);
+          featuredMemberResolvedAvatarUrl_ = value;
+          bitField0_ |= 0x00000008;
+          onChanged();
+          return this;
+        }
+
+        // @@protoc_insertion_point(builder_scope:gitpod.v1.OnboardingSettings.WelcomeMessage)
+      }
+
+      // @@protoc_insertion_point(class_scope:gitpod.v1.OnboardingSettings.WelcomeMessage)
+      private static final io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage DEFAULT_INSTANCE;
+      static {
+        DEFAULT_INSTANCE = new io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage();
+      }
+
+      public static io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser<WelcomeMessage>
+          PARSER = new com.google.protobuf.AbstractParser<WelcomeMessage>() {
+        @java.lang.Override
+        public WelcomeMessage parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (com.google.protobuf.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new com.google.protobuf.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
+        }
+      };
+
+      public static com.google.protobuf.Parser<WelcomeMessage> parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<WelcomeMessage> getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
 
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.gitpod.publicapi.v1.OrganizationOuterClass.internal_static_gitpod_v1_OnboardingSettings_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.class, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.Builder.class);
     }
 
     private int bitField0_;
@@ -3641,7 +4854,9 @@ private OnboardingSettings() {
     private volatile java.lang.Object internalLink_ = "";
     /**
      * <pre>
-     * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+     * internal_link is the link to an internal onboarding page for the
+     * organization, possibly featuring a custom onboarding guide and other
+     * resources
      * </pre>
      *
      * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -3653,7 +4868,9 @@ public boolean hasInternalLink() {
     }
     /**
      * <pre>
-     * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+     * internal_link is the link to an internal onboarding page for the
+     * organization, possibly featuring a custom onboarding guide and other
+     * resources
      * </pre>
      *
      * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -3674,7 +4891,9 @@ public java.lang.String getInternalLink() {
     }
     /**
      * <pre>
-     * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+     * internal_link is the link to an internal onboarding page for the
+     * organization, possibly featuring a custom onboarding guide and other
+     * resources
      * </pre>
      *
      * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -3701,7 +4920,8 @@ public java.lang.String getInternalLink() {
         com.google.protobuf.LazyStringArrayList.emptyList();
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3713,7 +4933,8 @@ public java.lang.String getInternalLink() {
     }
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3724,7 +4945,8 @@ public int getRecommendedRepositoriesCount() {
     }
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3736,7 +4958,8 @@ public java.lang.String getRecommendedRepositories(int index) {
     }
     /**
      * <pre>
-     * recommended_repositories are the repositories that are recommended for new org members
+     * recommended_repositories are the repositories that are recommended for new
+     * org members
      * </pre>
      *
      * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -3748,6 +4971,75 @@ public java.lang.String getRecommendedRepositories(int index) {
       return recommendedRepositories_.getByteString(index);
     }
 
+    public static final int UPDATE_RECOMMENDED_REPOSITORIES_FIELD_NUMBER = 3;
+    private boolean updateRecommendedRepositories_ = false;
+    /**
+     * <pre>
+     * update_recommended_repositories specifies whether recommended_repositories
+     * should be updated.
+     * This field **will not** be specified in server responses.
+     * </pre>
+     *
+     * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+     * @return Whether the updateRecommendedRepositories field is set.
+     */
+    @java.lang.Override
+    public boolean hasUpdateRecommendedRepositories() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * <pre>
+     * update_recommended_repositories specifies whether recommended_repositories
+     * should be updated.
+     * This field **will not** be specified in server responses.
+     * </pre>
+     *
+     * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+     * @return The updateRecommendedRepositories.
+     */
+    @java.lang.Override
+    public boolean getUpdateRecommendedRepositories() {
+      return updateRecommendedRepositories_;
+    }
+
+    public static final int WELCOME_MESSAGE_FIELD_NUMBER = 4;
+    private io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage welcomeMessage_;
+    /**
+     * <pre>
+     * welcome_message is the welcome message for the organization
+     * </pre>
+     *
+     * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+     * @return Whether the welcomeMessage field is set.
+     */
+    @java.lang.Override
+    public boolean hasWelcomeMessage() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * <pre>
+     * welcome_message is the welcome message for the organization
+     * </pre>
+     *
+     * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+     * @return The welcomeMessage.
+     */
+    @java.lang.Override
+    public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage getWelcomeMessage() {
+      return welcomeMessage_ == null ? io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance() : welcomeMessage_;
+    }
+    /**
+     * <pre>
+     * welcome_message is the welcome message for the organization
+     * </pre>
+     *
+     * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+     */
+    @java.lang.Override
+    public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder getWelcomeMessageOrBuilder() {
+      return welcomeMessage_ == null ? io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance() : welcomeMessage_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -3768,6 +5060,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < recommendedRepositories_.size(); i++) {
         com.google.protobuf.GeneratedMessage.writeString(output, 2, recommendedRepositories_.getRaw(i));
       }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeBool(3, updateRecommendedRepositories_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeMessage(4, getWelcomeMessage());
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -3788,6 +5086,14 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getRecommendedRepositoriesList().size();
       }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(3, updateRecommendedRepositories_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getWelcomeMessage());
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -3810,6 +5116,16 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getRecommendedRepositoriesList()
           .equals(other.getRecommendedRepositoriesList())) return false;
+      if (hasUpdateRecommendedRepositories() != other.hasUpdateRecommendedRepositories()) return false;
+      if (hasUpdateRecommendedRepositories()) {
+        if (getUpdateRecommendedRepositories()
+            != other.getUpdateRecommendedRepositories()) return false;
+      }
+      if (hasWelcomeMessage() != other.hasWelcomeMessage()) return false;
+      if (hasWelcomeMessage()) {
+        if (!getWelcomeMessage()
+            .equals(other.getWelcomeMessage())) return false;
+      }
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -3829,6 +5145,15 @@ public int hashCode() {
         hash = (37 * hash) + RECOMMENDED_REPOSITORIES_FIELD_NUMBER;
         hash = (53 * hash) + getRecommendedRepositoriesList().hashCode();
       }
+      if (hasUpdateRecommendedRepositories()) {
+        hash = (37 * hash) + UPDATE_RECOMMENDED_REPOSITORIES_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getUpdateRecommendedRepositories());
+      }
+      if (hasWelcomeMessage()) {
+        hash = (37 * hash) + WELCOME_MESSAGE_FIELD_NUMBER;
+        hash = (53 * hash) + getWelcomeMessage().hashCode();
+      }
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -3927,6 +5252,10 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
+     * <pre>
+     * onboarding_settings are the settings for the organization's onboarding
+     * </pre>
+     *
      * Protobuf type {@code gitpod.v1.OnboardingSettings}
      */
     public static final class Builder extends
@@ -3948,13 +5277,19 @@ public static final class Builder extends
 
       // Construct using io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.newBuilder()
       private Builder() {
-
+        maybeForceBuilderInitialization();
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
-
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage
+                .alwaysUseFieldBuilders) {
+          getWelcomeMessageFieldBuilder();
+        }
       }
       @java.lang.Override
       public Builder clear() {
@@ -3963,6 +5298,12 @@ public Builder clear() {
         internalLink_ = "";
         recommendedRepositories_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
+        updateRecommendedRepositories_ = false;
+        welcomeMessage_ = null;
+        if (welcomeMessageBuilder_ != null) {
+          welcomeMessageBuilder_.dispose();
+          welcomeMessageBuilder_ = null;
+        }
         return this;
       }
 
@@ -4005,6 +5346,16 @@ private void buildPartial0(io.gitpod.publicapi.v1.OrganizationOuterClass.Onboard
           recommendedRepositories_.makeImmutable();
           result.recommendedRepositories_ = recommendedRepositories_;
         }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.updateRecommendedRepositories_ = updateRecommendedRepositories_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.welcomeMessage_ = welcomeMessageBuilder_ == null
+              ? welcomeMessage_
+              : welcomeMessageBuilder_.build();
+          to_bitField0_ |= 0x00000004;
+        }
         result.bitField0_ |= to_bitField0_;
       }
 
@@ -4035,6 +5386,12 @@ public Builder mergeFrom(io.gitpod.publicapi.v1.OrganizationOuterClass.Onboardin
           }
           onChanged();
         }
+        if (other.hasUpdateRecommendedRepositories()) {
+          setUpdateRecommendedRepositories(other.getUpdateRecommendedRepositories());
+        }
+        if (other.hasWelcomeMessage()) {
+          mergeWelcomeMessage(other.getWelcomeMessage());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -4072,6 +5429,18 @@ public Builder mergeFrom(
                 recommendedRepositories_.add(s);
                 break;
               } // case 18
+              case 24: {
+                updateRecommendedRepositories_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                input.readMessage(
+                    getWelcomeMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -4092,7 +5461,9 @@ public Builder mergeFrom(
       private java.lang.Object internalLink_ = "";
       /**
        * <pre>
-       * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+       * internal_link is the link to an internal onboarding page for the
+       * organization, possibly featuring a custom onboarding guide and other
+       * resources
        * </pre>
        *
        * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -4103,7 +5474,9 @@ public boolean hasInternalLink() {
       }
       /**
        * <pre>
-       * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+       * internal_link is the link to an internal onboarding page for the
+       * organization, possibly featuring a custom onboarding guide and other
+       * resources
        * </pre>
        *
        * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -4123,7 +5496,9 @@ public java.lang.String getInternalLink() {
       }
       /**
        * <pre>
-       * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+       * internal_link is the link to an internal onboarding page for the
+       * organization, possibly featuring a custom onboarding guide and other
+       * resources
        * </pre>
        *
        * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -4144,7 +5519,9 @@ public java.lang.String getInternalLink() {
       }
       /**
        * <pre>
-       * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+       * internal_link is the link to an internal onboarding page for the
+       * organization, possibly featuring a custom onboarding guide and other
+       * resources
        * </pre>
        *
        * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -4161,7 +5538,9 @@ public Builder setInternalLink(
       }
       /**
        * <pre>
-       * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+       * internal_link is the link to an internal onboarding page for the
+       * organization, possibly featuring a custom onboarding guide and other
+       * resources
        * </pre>
        *
        * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -4175,7 +5554,9 @@ public Builder clearInternalLink() {
       }
       /**
        * <pre>
-       * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+       * internal_link is the link to an internal onboarding page for the
+       * organization, possibly featuring a custom onboarding guide and other
+       * resources
        * </pre>
        *
        * <code>optional string internal_link = 1 [json_name = "internalLink"];</code>
@@ -4202,7 +5583,8 @@ private void ensureRecommendedRepositoriesIsMutable() {
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4215,7 +5597,8 @@ private void ensureRecommendedRepositoriesIsMutable() {
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4226,7 +5609,8 @@ public int getRecommendedRepositoriesCount() {
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4238,7 +5622,8 @@ public java.lang.String getRecommendedRepositories(int index) {
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4251,7 +5636,8 @@ public java.lang.String getRecommendedRepositories(int index) {
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4270,7 +5656,8 @@ public Builder setRecommendedRepositories(
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4288,7 +5675,8 @@ public Builder addRecommendedRepositories(
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4306,7 +5694,8 @@ public Builder addAllRecommendedRepositories(
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4321,7 +5710,8 @@ public Builder clearRecommendedRepositories() {
       }
       /**
        * <pre>
-       * recommended_repositories are the repositories that are recommended for new org members
+       * recommended_repositories are the repositories that are recommended for new
+       * org members
        * </pre>
        *
        * <code>repeated string recommended_repositories = 2 [json_name = "recommendedRepositories"];</code>
@@ -4339,6 +5729,227 @@ public Builder addRecommendedRepositoriesBytes(
         return this;
       }
 
+      private boolean updateRecommendedRepositories_ ;
+      /**
+       * <pre>
+       * update_recommended_repositories specifies whether recommended_repositories
+       * should be updated.
+       * This field **will not** be specified in server responses.
+       * </pre>
+       *
+       * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+       * @return Whether the updateRecommendedRepositories field is set.
+       */
+      @java.lang.Override
+      public boolean hasUpdateRecommendedRepositories() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * <pre>
+       * update_recommended_repositories specifies whether recommended_repositories
+       * should be updated.
+       * This field **will not** be specified in server responses.
+       * </pre>
+       *
+       * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+       * @return The updateRecommendedRepositories.
+       */
+      @java.lang.Override
+      public boolean getUpdateRecommendedRepositories() {
+        return updateRecommendedRepositories_;
+      }
+      /**
+       * <pre>
+       * update_recommended_repositories specifies whether recommended_repositories
+       * should be updated.
+       * This field **will not** be specified in server responses.
+       * </pre>
+       *
+       * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+       * @param value The updateRecommendedRepositories to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUpdateRecommendedRepositories(boolean value) {
+
+        updateRecommendedRepositories_ = value;
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * update_recommended_repositories specifies whether recommended_repositories
+       * should be updated.
+       * This field **will not** be specified in server responses.
+       * </pre>
+       *
+       * <code>optional bool update_recommended_repositories = 3 [json_name = "updateRecommendedRepositories"];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUpdateRecommendedRepositories() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        updateRecommendedRepositories_ = false;
+        onChanged();
+        return this;
+      }
+
+      private io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage welcomeMessage_;
+      private com.google.protobuf.SingleFieldBuilder<
+          io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder> welcomeMessageBuilder_;
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       * @return Whether the welcomeMessage field is set.
+       */
+      public boolean hasWelcomeMessage() {
+        return ((bitField0_ & 0x00000008) != 0);
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       * @return The welcomeMessage.
+       */
+      public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage getWelcomeMessage() {
+        if (welcomeMessageBuilder_ == null) {
+          return welcomeMessage_ == null ? io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance() : welcomeMessage_;
+        } else {
+          return welcomeMessageBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      public Builder setWelcomeMessage(io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage value) {
+        if (welcomeMessageBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          welcomeMessage_ = value;
+        } else {
+          welcomeMessageBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      public Builder setWelcomeMessage(
+          io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder builderForValue) {
+        if (welcomeMessageBuilder_ == null) {
+          welcomeMessage_ = builderForValue.build();
+        } else {
+          welcomeMessageBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      public Builder mergeWelcomeMessage(io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage value) {
+        if (welcomeMessageBuilder_ == null) {
+          if (((bitField0_ & 0x00000008) != 0) &&
+            welcomeMessage_ != null &&
+            welcomeMessage_ != io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance()) {
+            getWelcomeMessageBuilder().mergeFrom(value);
+          } else {
+            welcomeMessage_ = value;
+          }
+        } else {
+          welcomeMessageBuilder_.mergeFrom(value);
+        }
+        if (welcomeMessage_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      public Builder clearWelcomeMessage() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        welcomeMessage_ = null;
+        if (welcomeMessageBuilder_ != null) {
+          welcomeMessageBuilder_.dispose();
+          welcomeMessageBuilder_ = null;
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder getWelcomeMessageBuilder() {
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return getWelcomeMessageFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder getWelcomeMessageOrBuilder() {
+        if (welcomeMessageBuilder_ != null) {
+          return welcomeMessageBuilder_.getMessageOrBuilder();
+        } else {
+          return welcomeMessage_ == null ?
+              io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.getDefaultInstance() : welcomeMessage_;
+        }
+      }
+      /**
+       * <pre>
+       * welcome_message is the welcome message for the organization
+       * </pre>
+       *
+       * <code>optional .gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4 [json_name = "welcomeMessage"];</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder>
+          getWelcomeMessageFieldBuilder() {
+        if (welcomeMessageBuilder_ == null) {
+          welcomeMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessage.Builder, io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettings.WelcomeMessageOrBuilder>(
+                  getWelcomeMessage(),
+                  getParentForChildren(),
+                  isClean());
+          welcomeMessage_ = null;
+        }
+        return welcomeMessageBuilder_;
+      }
+
       // @@protoc_insertion_point(builder_scope:gitpod.v1.OnboardingSettings)
     }
 
@@ -4549,7 +6160,9 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
 
     /**
      * <pre>
-     * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+     * max_parallel_running_workspaces is the maximum number of workspaces that a
+     * single user can run in parallel. 0 resets to the default, which depends on
+     * the org plan
      * </pre>
      *
      * <code>int32 max_parallel_running_workspaces = 9 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -4948,7 +6561,9 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuild
     private int maxParallelRunningWorkspaces_ = 0;
     /**
      * <pre>
-     * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+     * max_parallel_running_workspaces is the maximum number of workspaces that a
+     * single user can run in parallel. 0 resets to the default, which depends on
+     * the org plan
      * </pre>
      *
      * <code>int32 max_parallel_running_workspaces = 9 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -6569,7 +8184,9 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builde
       private int maxParallelRunningWorkspaces_ ;
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>int32 max_parallel_running_workspaces = 9 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -6581,7 +8198,9 @@ public int getMaxParallelRunningWorkspaces() {
       }
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>int32 max_parallel_running_workspaces = 9 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -6597,7 +8216,9 @@ public Builder setMaxParallelRunningWorkspaces(int value) {
       }
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>int32 max_parallel_running_workspaces = 9 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -9951,7 +11572,8 @@ public interface TimeoutSettingsOrBuilder extends
 
     /**
      * <pre>
-     * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+     * deny_user_timeout specifies whether applying custom timeouts is denied for
+     * organization members
      * </pre>
      *
      * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -9960,7 +11582,8 @@ public interface TimeoutSettingsOrBuilder extends
     boolean hasDenyUserTimeouts();
     /**
      * <pre>
-     * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+     * deny_user_timeout specifies whether applying custom timeouts is denied for
+     * organization members
      * </pre>
      *
      * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -10048,7 +11671,8 @@ public com.google.protobuf.DurationOrBuilder getInactivityOrBuilder() {
     private boolean denyUserTimeouts_ = false;
     /**
      * <pre>
-     * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+     * deny_user_timeout specifies whether applying custom timeouts is denied for
+     * organization members
      * </pre>
      *
      * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -10060,7 +11684,8 @@ public boolean hasDenyUserTimeouts() {
     }
     /**
      * <pre>
-     * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+     * deny_user_timeout specifies whether applying custom timeouts is denied for
+     * organization members
      * </pre>
      *
      * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -10576,7 +12201,8 @@ public com.google.protobuf.DurationOrBuilder getInactivityOrBuilder() {
       private boolean denyUserTimeouts_ ;
       /**
        * <pre>
-       * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+       * deny_user_timeout specifies whether applying custom timeouts is denied for
+       * organization members
        * </pre>
        *
        * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -10588,7 +12214,8 @@ public boolean hasDenyUserTimeouts() {
       }
       /**
        * <pre>
-       * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+       * deny_user_timeout specifies whether applying custom timeouts is denied for
+       * organization members
        * </pre>
        *
        * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -10600,7 +12227,8 @@ public boolean getDenyUserTimeouts() {
       }
       /**
        * <pre>
-       * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+       * deny_user_timeout specifies whether applying custom timeouts is denied for
+       * organization members
        * </pre>
        *
        * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -10616,7 +12244,8 @@ public Builder setDenyUserTimeouts(boolean value) {
       }
       /**
        * <pre>
-       * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+       * deny_user_timeout specifies whether applying custom timeouts is denied for
+       * organization members
        * </pre>
        *
        * <code>optional bool deny_user_timeouts = 2 [json_name = "denyUserTimeouts"];</code>
@@ -11025,7 +12654,8 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
 
     /**
      * <pre>
-     * update_role_restrictions specifies whether role_restrictions should be updated
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
      * </pre>
      *
      * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -11034,7 +12664,8 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
     boolean hasUpdateRoleRestrictions();
     /**
      * <pre>
-     * update_role_restrictions specifies whether role_restrictions should be updated
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
      * </pre>
      *
      * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -11044,7 +12675,9 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
 
     /**
      * <pre>
-     * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+     * max_parallel_running_workspaces is the maximum number of workspaces that a
+     * single user can run in parallel. 0 resets to the default, which depends on
+     * the org plan
      * </pre>
      *
      * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -11053,7 +12686,9 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
     boolean hasMaxParallelRunningWorkspaces();
     /**
      * <pre>
-     * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+     * max_parallel_running_workspaces is the maximum number of workspaces that a
+     * single user can run in parallel. 0 resets to the default, which depends on
+     * the org plan
      * </pre>
      *
      * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -11090,7 +12725,8 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
 
     /**
      * <pre>
-     * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+     * annotate_git_commits specifies whether to annotate git commits created in
+     * Gitpod workspaces with the gitpod host
      * </pre>
      *
      * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -11099,7 +12735,8 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
     boolean hasAnnotateGitCommits();
     /**
      * <pre>
-     * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+     * annotate_git_commits specifies whether to annotate git commits created in
+     * Gitpod workspaces with the gitpod host
      * </pre>
      *
      * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -11711,7 +13348,8 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuild
     private boolean updateRoleRestrictions_ = false;
     /**
      * <pre>
-     * update_role_restrictions specifies whether role_restrictions should be updated
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
      * </pre>
      *
      * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -11723,7 +13361,8 @@ public boolean hasUpdateRoleRestrictions() {
     }
     /**
      * <pre>
-     * update_role_restrictions specifies whether role_restrictions should be updated
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
      * </pre>
      *
      * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -11738,7 +13377,9 @@ public boolean getUpdateRoleRestrictions() {
     private int maxParallelRunningWorkspaces_ = 0;
     /**
      * <pre>
-     * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+     * max_parallel_running_workspaces is the maximum number of workspaces that a
+     * single user can run in parallel. 0 resets to the default, which depends on
+     * the org plan
      * </pre>
      *
      * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -11750,7 +13391,9 @@ public boolean hasMaxParallelRunningWorkspaces() {
     }
     /**
      * <pre>
-     * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+     * max_parallel_running_workspaces is the maximum number of workspaces that a
+     * single user can run in parallel. 0 resets to the default, which depends on
+     * the org plan
      * </pre>
      *
      * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -11803,7 +13446,8 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettingsOrBuilder
     private boolean annotateGitCommits_ = false;
     /**
      * <pre>
-     * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+     * annotate_git_commits specifies whether to annotate git commits created in
+     * Gitpod workspaces with the gitpod host
      * </pre>
      *
      * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -11815,7 +13459,8 @@ public boolean hasAnnotateGitCommits() {
     }
     /**
      * <pre>
-     * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+     * annotate_git_commits specifies whether to annotate git commits created in
+     * Gitpod workspaces with the gitpod host
      * </pre>
      *
      * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -14005,7 +15650,8 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builde
       private boolean updateRoleRestrictions_ ;
       /**
        * <pre>
-       * update_role_restrictions specifies whether role_restrictions should be updated
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
        * </pre>
        *
        * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -14017,7 +15663,8 @@ public boolean hasUpdateRoleRestrictions() {
       }
       /**
        * <pre>
-       * update_role_restrictions specifies whether role_restrictions should be updated
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
        * </pre>
        *
        * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -14029,7 +15676,8 @@ public boolean getUpdateRoleRestrictions() {
       }
       /**
        * <pre>
-       * update_role_restrictions specifies whether role_restrictions should be updated
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
        * </pre>
        *
        * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -14045,7 +15693,8 @@ public Builder setUpdateRoleRestrictions(boolean value) {
       }
       /**
        * <pre>
-       * update_role_restrictions specifies whether role_restrictions should be updated
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
        * </pre>
        *
        * <code>optional bool update_role_restrictions = 13 [json_name = "updateRoleRestrictions"];</code>
@@ -14061,7 +15710,9 @@ public Builder clearUpdateRoleRestrictions() {
       private int maxParallelRunningWorkspaces_ ;
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -14073,7 +15724,9 @@ public boolean hasMaxParallelRunningWorkspaces() {
       }
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -14085,7 +15738,9 @@ public int getMaxParallelRunningWorkspaces() {
       }
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -14101,7 +15756,9 @@ public Builder setMaxParallelRunningWorkspaces(int value) {
       }
       /**
        * <pre>
-       * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+       * max_parallel_running_workspaces is the maximum number of workspaces that a
+       * single user can run in parallel. 0 resets to the default, which depends on
+       * the org plan
        * </pre>
        *
        * <code>optional int32 max_parallel_running_workspaces = 15 [json_name = "maxParallelRunningWorkspaces"];</code>
@@ -14274,7 +15931,8 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.OnboardingSettingsOrBuilder
       private boolean annotateGitCommits_ ;
       /**
        * <pre>
-       * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+       * annotate_git_commits specifies whether to annotate git commits created in
+       * Gitpod workspaces with the gitpod host
        * </pre>
        *
        * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -14286,7 +15944,8 @@ public boolean hasAnnotateGitCommits() {
       }
       /**
        * <pre>
-       * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+       * annotate_git_commits specifies whether to annotate git commits created in
+       * Gitpod workspaces with the gitpod host
        * </pre>
        *
        * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -14298,7 +15957,8 @@ public boolean getAnnotateGitCommits() {
       }
       /**
        * <pre>
-       * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+       * annotate_git_commits specifies whether to annotate git commits created in
+       * Gitpod workspaces with the gitpod host
        * </pre>
        *
        * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -14314,7 +15974,8 @@ public Builder setAnnotateGitCommits(boolean value) {
       }
       /**
        * <pre>
-       * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+       * annotate_git_commits specifies whether to annotate git commits created in
+       * Gitpod workspaces with the gitpod host
        * </pre>
        *
        * <code>optional bool annotate_git_commits = 17 [json_name = "annotateGitCommits"];</code>
@@ -29219,6 +30880,11 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.DeleteOrganizationMemberRes
   private static final
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_gitpod_v1_OnboardingSettings_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_descriptor;
+  private static final
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_gitpod_v1_OrganizationSettings_descriptor;
   private static final
@@ -29406,187 +31072,200 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.DeleteOrganizationMemberRes
       "leRestrictionEntry\022/\n\004role\030\001 \001(\0162\033.gitpo" +
       "d.v1.OrganizationRoleR\004role\022C\n\013permissio" +
       "ns\030\002 \003(\0162!.gitpod.v1.OrganizationPermiss" +
-      "ionR\013permissions\"\213\001\n\022OnboardingSettings\022" +
+      "ionR\013permissions\"\211\005\n\022OnboardingSettings\022" +
       "(\n\rinternal_link\030\001 \001(\tH\000R\014internalLink\210\001" +
       "\001\0229\n\030recommended_repositories\030\002 \003(\tR\027rec" +
-      "ommendedRepositoriesB\020\n\016_internal_link\"\273" +
-      "\006\n\024OrganizationSettings\022<\n\032workspace_sha" +
-      "ring_disabled\030\001 \001(\010R\030workspaceSharingDis" +
-      "abled\0226\n\027default_workspace_image\030\002 \001(\tR\025" +
-      "defaultWorkspaceImage\022:\n\031allowed_workspa" +
-      "ce_classes\030\003 \003(\tR\027allowedWorkspaceClasse" +
-      "s\0226\n\027restricted_editor_names\030\004 \003(\tR\025rest" +
-      "rictedEditorNames\022o\n\026pinned_editor_versi" +
-      "ons\030\005 \003(\01329.gitpod.v1.OrganizationSettin" +
-      "gs.PinnedEditorVersionsEntryR\024pinnedEdit" +
-      "orVersions\022!\n\014default_role\030\006 \001(\tR\013defaul" +
-      "tRole\022E\n\020timeout_settings\030\007 \001(\0132\032.gitpod" +
-      ".v1.TimeoutSettingsR\017timeoutSettings\022L\n\021" +
-      "role_restrictions\030\010 \003(\0132\037.gitpod.v1.Role" +
-      "RestrictionEntryR\020roleRestrictions\022E\n\037ma" +
-      "x_parallel_running_workspaces\030\t \001(\005R\034max" +
-      "ParallelRunningWorkspaces\022N\n\023onboarding_" +
-      "settings\030\n \001(\0132\035.gitpod.v1.OnboardingSet" +
-      "tingsR\022onboardingSettings\0220\n\024annotate_gi" +
-      "t_commits\030\013 \001(\010R\022annotateGitCommits\032G\n\031P" +
-      "innedEditorVersionsEntry\022\020\n\003key\030\001 \001(\tR\003k" +
-      "ey\022\024\n\005value\030\002 \001(\tR\005value:\0028\001\"\220\001\n\'ListOrg" +
-      "anizationWorkspaceClassesRequest\022<\n\npagi" +
-      "nation\030\001 \001(\0132\034.gitpod.v1.PaginationReque" +
-      "stR\npagination\022\'\n\017organization_id\030\002 \001(\tR" +
-      "\016organizationId\"\261\001\n(ListOrganizationWork" +
-      "spaceClassesResponse\022=\n\npagination\030\001 \001(\013" +
-      "2\035.gitpod.v1.PaginationResponseR\npaginat" +
-      "ion\022F\n\021workspace_classes\030\002 \003(\0132\031.gitpod." +
-      "v1.WorkspaceClassR\020workspaceClasses\"f\n\031U" +
-      "pdateOrganizationRequest\022\'\n\017organization" +
-      "_id\030\001 \001(\tR\016organizationId\022\027\n\004name\030\002 \001(\tH" +
-      "\000R\004name\210\001\001B\007\n\005_name\"Y\n\032UpdateOrganizatio" +
-      "nResponse\022;\n\014organization\030\001 \001(\0132\027.gitpod" +
-      ".v1.OrganizationR\014organization\"\252\001\n\017Timeo" +
-      "utSettings\022>\n\ninactivity\030\001 \001(\0132\031.google." +
-      "protobuf.DurationH\000R\ninactivity\210\001\001\0221\n\022de" +
-      "ny_user_timeouts\030\002 \001(\010H\001R\020denyUserTimeou" +
-      "ts\210\001\001B\r\n\013_inactivityB\025\n\023_deny_user_timeo" +
-      "uts\"\212\013\n!UpdateOrganizationSettingsReques" +
-      "t\022\'\n\017organization_id\030\001 \001(\tR\016organization" +
-      "Id\022A\n\032workspace_sharing_disabled\030\003 \001(\010H\000" +
-      "R\030workspaceSharingDisabled\210\001\001\022;\n\027default" +
-      "_workspace_image\030\004 \001(\tH\001R\025defaultWorkspa" +
-      "ceImage\210\001\001\022:\n\031allowed_workspace_classes\030" +
-      "\005 \003(\tR\027allowedWorkspaceClasses\0226\n\027restri" +
-      "cted_editor_names\030\006 \003(\tR\025restrictedEdito" +
-      "rNames\022H\n\036update_restricted_editor_names" +
-      "\030\007 \001(\010H\002R\033updateRestrictedEditorNames\210\001\001" +
-      "\022|\n\026pinned_editor_versions\030\010 \003(\0132F.gitpo" +
-      "d.v1.UpdateOrganizationSettingsRequest.P" +
-      "innedEditorVersionsEntryR\024pinnedEditorVe" +
-      "rsions\022F\n\035update_pinned_editor_versions\030" +
-      "\t \001(\010H\003R\032updatePinnedEditorVersions\210\001\001\022&" +
-      "\n\014default_role\030\n \001(\tH\004R\013defaultRole\210\001\001\022J" +
-      "\n\020timeout_settings\030\013 \001(\0132\032.gitpod.v1.Tim" +
-      "eoutSettingsH\005R\017timeoutSettings\210\001\001\022L\n\021ro" +
-      "le_restrictions\030\014 \003(\0132\037.gitpod.v1.RoleRe" +
-      "strictionEntryR\020roleRestrictions\022=\n\030upda" +
-      "te_role_restrictions\030\r \001(\010H\006R\026updateRole" +
-      "Restrictions\210\001\001\022J\n\037max_parallel_running_" +
-      "workspaces\030\017 \001(\005H\007R\034maxParallelRunningWo" +
-      "rkspaces\210\001\001\022S\n\023onboarding_settings\030\020 \001(\013" +
-      "2\035.gitpod.v1.OnboardingSettingsH\010R\022onboa" +
-      "rdingSettings\210\001\001\0225\n\024annotate_git_commits" +
-      "\030\021 \001(\010H\tR\022annotateGitCommits\210\001\001\032G\n\031Pinne" +
-      "dEditorVersionsEntry\022\020\n\003key\030\001 \001(\tR\003key\022\024" +
-      "\n\005value\030\002 \001(\tR\005value:\0028\001B\035\n\033_workspace_s" +
-      "haring_disabledB\032\n\030_default_workspace_im" +
-      "ageB!\n\037_update_restricted_editor_namesB " +
-      "\n\036_update_pinned_editor_versionsB\017\n\r_def" +
-      "ault_roleB\023\n\021_timeout_settingsB\033\n\031_updat" +
-      "e_role_restrictionsB\"\n _max_parallel_run" +
-      "ning_workspacesB\026\n\024_onboarding_settingsB" +
-      "\027\n\025_annotate_git_commits\"a\n\"UpdateOrgani" +
-      "zationSettingsResponse\022;\n\010settings\030\001 \001(\013" +
-      "2\037.gitpod.v1.OrganizationSettingsR\010setti" +
-      "ngs\"I\n\036GetOrganizationSettingsRequest\022\'\n" +
-      "\017organization_id\030\001 \001(\tR\016organizationId\"^" +
-      "\n\037GetOrganizationSettingsResponse\022;\n\010set" +
-      "tings\030\001 \001(\0132\037.gitpod.v1.OrganizationSett" +
-      "ingsR\010settings\"/\n\031CreateOrganizationRequ" +
-      "est\022\022\n\004name\030\001 \001(\tR\004name\"Y\n\032CreateOrganiz" +
-      "ationResponse\022;\n\014organization\030\001 \001(\0132\027.gi" +
-      "tpod.v1.OrganizationR\014organization\"A\n\026Ge" +
-      "tOrganizationRequest\022\'\n\017organization_id\030" +
-      "\001 \001(\tR\016organizationId\"V\n\027GetOrganization" +
-      "Response\022;\n\014organization\030\001 \001(\0132\027.gitpod." +
-      "v1.OrganizationR\014organization\"\332\001\n\030ListOr" +
-      "ganizationsRequest\022<\n\npagination\030\001 \001(\0132\034" +
-      ".gitpod.v1.PaginationRequestR\npagination" +
-      "\022?\n\005scope\030\002 \001(\0162).gitpod.v1.ListOrganiza" +
-      "tionsRequest.ScopeR\005scope\"?\n\005Scope\022\025\n\021SC" +
-      "OPE_UNSPECIFIED\020\000\022\020\n\014SCOPE_MEMBER\020\001\022\r\n\tS" +
-      "COPE_ALL\020\002\"\231\001\n\031ListOrganizationsResponse" +
-      "\022=\n\rorganizations\030\001 \003(\0132\027.gitpod.v1.Orga" +
-      "nizationR\rorganizations\022=\n\npagination\030\002 " +
-      "\001(\0132\035.gitpod.v1.PaginationResponseR\npagi" +
-      "nation\"D\n\031DeleteOrganizationRequest\022\'\n\017o" +
-      "rganization_id\030\001 \001(\tR\016organizationId\"\034\n\032" +
-      "DeleteOrganizationResponse\"K\n GetOrganiz" +
-      "ationInvitationRequest\022\'\n\017organization_i" +
-      "d\030\001 \001(\tR\016organizationId\"H\n!GetOrganizati" +
-      "onInvitationResponse\022#\n\rinvitation_id\030\001 " +
-      "\001(\tR\014invitationId\">\n\027JoinOrganizationReq" +
-      "uest\022#\n\rinvitation_id\030\001 \001(\tR\014invitationI" +
-      "d\"C\n\030JoinOrganizationResponse\022\'\n\017organiz" +
-      "ation_id\030\001 \001(\tR\016organizationId\"M\n\"ResetO" +
-      "rganizationInvitationRequest\022\'\n\017organiza" +
-      "tion_id\030\001 \001(\tR\016organizationId\"J\n#ResetOr" +
-      "ganizationInvitationResponse\022#\n\rinvitati" +
-      "on_id\030\001 \001(\tR\014invitationId\"\207\001\n\036ListOrgani" +
-      "zationMembersRequest\022\'\n\017organization_id\030" +
-      "\001 \001(\tR\016organizationId\022<\n\npagination\030\002 \001(" +
-      "\0132\034.gitpod.v1.PaginationRequestR\npaginat" +
-      "ion\"\231\001\n\037ListOrganizationMembersResponse\022" +
-      "7\n\007members\030\001 \003(\0132\035.gitpod.v1.Organizatio" +
-      "nMemberR\007members\022=\n\npagination\030\002 \001(\0132\035.g" +
-      "itpod.v1.PaginationResponseR\npagination\"" +
-      "\242\001\n\037UpdateOrganizationMemberRequest\022\'\n\017o" +
-      "rganization_id\030\001 \001(\tR\016organizationId\022\027\n\007" +
-      "user_id\030\002 \001(\tR\006userId\0224\n\004role\030\003 \001(\0162\033.gi" +
-      "tpod.v1.OrganizationRoleH\000R\004role\210\001\001B\007\n\005_" +
-      "role\"Y\n UpdateOrganizationMemberResponse" +
-      "\0225\n\006member\030\001 \001(\0132\035.gitpod.v1.Organizatio" +
-      "nMemberR\006member\"c\n\037DeleteOrganizationMem" +
-      "berRequest\022\'\n\017organization_id\030\001 \001(\tR\016org" +
-      "anizationId\022\027\n\007user_id\030\002 \001(\tR\006userId\"\"\n " +
-      "DeleteOrganizationMemberResponse*\224\001\n\020Org" +
-      "anizationRole\022!\n\035ORGANIZATION_ROLE_UNSPE" +
-      "CIFIED\020\000\022\033\n\027ORGANIZATION_ROLE_OWNER\020\001\022\034\n" +
-      "\030ORGANIZATION_ROLE_MEMBER\020\002\022\"\n\036ORGANIZAT" +
-      "ION_ROLE_COLLABORATOR\020\003*t\n\026OrganizationP" +
-      "ermission\022\'\n#ORGANIZATION_PERMISSION_UNS" +
-      "PECIFIED\020\000\0221\n-ORGANIZATION_PERMISSION_ST" +
-      "ART_ARBITRARY_REPOS\020\0012\276\014\n\023OrganizationSe" +
-      "rvice\022c\n\022CreateOrganization\022$.gitpod.v1." +
-      "CreateOrganizationRequest\032%.gitpod.v1.Cr" +
-      "eateOrganizationResponse\"\000\022Z\n\017GetOrganiz" +
-      "ation\022!.gitpod.v1.GetOrganizationRequest" +
-      "\032\".gitpod.v1.GetOrganizationResponse\"\000\022c" +
-      "\n\022UpdateOrganization\022$.gitpod.v1.UpdateO" +
-      "rganizationRequest\032%.gitpod.v1.UpdateOrg" +
-      "anizationResponse\"\000\022`\n\021ListOrganizations" +
-      "\022#.gitpod.v1.ListOrganizationsRequest\032$." +
-      "gitpod.v1.ListOrganizationsResponse\"\000\022c\n" +
-      "\022DeleteOrganization\022$.gitpod.v1.DeleteOr" +
-      "ganizationRequest\032%.gitpod.v1.DeleteOrga" +
-      "nizationResponse\"\000\022x\n\031GetOrganizationInv" +
-      "itation\022+.gitpod.v1.GetOrganizationInvit" +
-      "ationRequest\032,.gitpod.v1.GetOrganization" +
-      "InvitationResponse\"\000\022]\n\020JoinOrganization" +
-      "\022\".gitpod.v1.JoinOrganizationRequest\032#.g" +
-      "itpod.v1.JoinOrganizationResponse\"\000\022~\n\033R" +
-      "esetOrganizationInvitation\022-.gitpod.v1.R" +
-      "esetOrganizationInvitationRequest\032..gitp" +
-      "od.v1.ResetOrganizationInvitationRespons" +
-      "e\"\000\022r\n\027ListOrganizationMembers\022).gitpod." +
-      "v1.ListOrganizationMembersRequest\032*.gitp" +
-      "od.v1.ListOrganizationMembersResponse\"\000\022" +
-      "u\n\030UpdateOrganizationMember\022*.gitpod.v1." +
-      "UpdateOrganizationMemberRequest\032+.gitpod" +
-      ".v1.UpdateOrganizationMemberResponse\"\000\022u" +
-      "\n\030DeleteOrganizationMember\022*.gitpod.v1.D" +
-      "eleteOrganizationMemberRequest\032+.gitpod." +
-      "v1.DeleteOrganizationMemberResponse\"\000\022r\n" +
-      "\027GetOrganizationSettings\022).gitpod.v1.Get" +
-      "OrganizationSettingsRequest\032*.gitpod.v1." +
-      "GetOrganizationSettingsResponse\"\000\022{\n\032Upd" +
-      "ateOrganizationSettings\022,.gitpod.v1.Upda" +
-      "teOrganizationSettingsRequest\032-.gitpod.v" +
-      "1.UpdateOrganizationSettingsResponse\"\000\022\215" +
-      "\001\n ListOrganizationWorkspaceClasses\0222.gi" +
-      "tpod.v1.ListOrganizationWorkspaceClasses" +
-      "Request\0323.gitpod.v1.ListOrganizationWork" +
-      "spaceClassesResponse\"\000BQ\n\026io.gitpod.publ" +
-      "icapi.v1Z7github.com/gitpod-io/gitpod/co" +
-      "mponents/public-api/go/v1b\006proto3"
+      "ommendedRepositories\022K\n\037update_recommend" +
+      "ed_repositories\030\003 \001(\010H\001R\035updateRecommend" +
+      "edRepositories\210\001\001\022Z\n\017welcome_message\030\004 \001" +
+      "(\0132,.gitpod.v1.OnboardingSettings.Welcom" +
+      "eMessageH\002R\016welcomeMessage\210\001\001\032\232\002\n\016Welcom" +
+      "eMessage\022\030\n\007enabled\030\001 \001(\010R\007enabled\022\035\n\007me" +
+      "ssage\030\002 \001(\tH\000R\007message\210\001\001\0221\n\022featured_me" +
+      "mber_id\030\004 \001(\tH\001R\020featuredMemberId\210\001\001\022Q\n#" +
+      "featured_member_resolved_avatar_url\030\005 \001(" +
+      "\tH\002R\037featuredMemberResolvedAvatarUrl\210\001\001B" +
+      "\n\n\010_messageB\025\n\023_featured_member_idB&\n$_f" +
+      "eatured_member_resolved_avatar_urlB\020\n\016_i" +
+      "nternal_linkB\"\n _update_recommended_repo" +
+      "sitoriesB\022\n\020_welcome_message\"\273\006\n\024Organiz" +
+      "ationSettings\022<\n\032workspace_sharing_disab" +
+      "led\030\001 \001(\010R\030workspaceSharingDisabled\0226\n\027d" +
+      "efault_workspace_image\030\002 \001(\tR\025defaultWor" +
+      "kspaceImage\022:\n\031allowed_workspace_classes" +
+      "\030\003 \003(\tR\027allowedWorkspaceClasses\0226\n\027restr" +
+      "icted_editor_names\030\004 \003(\tR\025restrictedEdit" +
+      "orNames\022o\n\026pinned_editor_versions\030\005 \003(\0132" +
+      "9.gitpod.v1.OrganizationSettings.PinnedE" +
+      "ditorVersionsEntryR\024pinnedEditorVersions" +
+      "\022!\n\014default_role\030\006 \001(\tR\013defaultRole\022E\n\020t" +
+      "imeout_settings\030\007 \001(\0132\032.gitpod.v1.Timeou" +
+      "tSettingsR\017timeoutSettings\022L\n\021role_restr" +
+      "ictions\030\010 \003(\0132\037.gitpod.v1.RoleRestrictio" +
+      "nEntryR\020roleRestrictions\022E\n\037max_parallel" +
+      "_running_workspaces\030\t \001(\005R\034maxParallelRu" +
+      "nningWorkspaces\022N\n\023onboarding_settings\030\n" +
+      " \001(\0132\035.gitpod.v1.OnboardingSettingsR\022onb" +
+      "oardingSettings\0220\n\024annotate_git_commits\030" +
+      "\013 \001(\010R\022annotateGitCommits\032G\n\031PinnedEdito" +
+      "rVersionsEntry\022\020\n\003key\030\001 \001(\tR\003key\022\024\n\005valu" +
+      "e\030\002 \001(\tR\005value:\0028\001\"\220\001\n\'ListOrganizationW" +
+      "orkspaceClassesRequest\022<\n\npagination\030\001 \001" +
+      "(\0132\034.gitpod.v1.PaginationRequestR\npagina" +
+      "tion\022\'\n\017organization_id\030\002 \001(\tR\016organizat" +
+      "ionId\"\261\001\n(ListOrganizationWorkspaceClass" +
+      "esResponse\022=\n\npagination\030\001 \001(\0132\035.gitpod." +
+      "v1.PaginationResponseR\npagination\022F\n\021wor" +
+      "kspace_classes\030\002 \003(\0132\031.gitpod.v1.Workspa" +
+      "ceClassR\020workspaceClasses\"f\n\031UpdateOrgan" +
+      "izationRequest\022\'\n\017organization_id\030\001 \001(\tR" +
+      "\016organizationId\022\027\n\004name\030\002 \001(\tH\000R\004name\210\001\001" +
+      "B\007\n\005_name\"Y\n\032UpdateOrganizationResponse\022" +
+      ";\n\014organization\030\001 \001(\0132\027.gitpod.v1.Organi" +
+      "zationR\014organization\"\252\001\n\017TimeoutSettings" +
+      "\022>\n\ninactivity\030\001 \001(\0132\031.google.protobuf.D" +
+      "urationH\000R\ninactivity\210\001\001\0221\n\022deny_user_ti" +
+      "meouts\030\002 \001(\010H\001R\020denyUserTimeouts\210\001\001B\r\n\013_" +
+      "inactivityB\025\n\023_deny_user_timeouts\"\212\013\n!Up" +
+      "dateOrganizationSettingsRequest\022\'\n\017organ" +
+      "ization_id\030\001 \001(\tR\016organizationId\022A\n\032work" +
+      "space_sharing_disabled\030\003 \001(\010H\000R\030workspac" +
+      "eSharingDisabled\210\001\001\022;\n\027default_workspace" +
+      "_image\030\004 \001(\tH\001R\025defaultWorkspaceImage\210\001\001" +
+      "\022:\n\031allowed_workspace_classes\030\005 \003(\tR\027all" +
+      "owedWorkspaceClasses\0226\n\027restricted_edito" +
+      "r_names\030\006 \003(\tR\025restrictedEditorNames\022H\n\036" +
+      "update_restricted_editor_names\030\007 \001(\010H\002R\033" +
+      "updateRestrictedEditorNames\210\001\001\022|\n\026pinned" +
+      "_editor_versions\030\010 \003(\0132F.gitpod.v1.Updat" +
+      "eOrganizationSettingsRequest.PinnedEdito" +
+      "rVersionsEntryR\024pinnedEditorVersions\022F\n\035" +
+      "update_pinned_editor_versions\030\t \001(\010H\003R\032u" +
+      "pdatePinnedEditorVersions\210\001\001\022&\n\014default_" +
+      "role\030\n \001(\tH\004R\013defaultRole\210\001\001\022J\n\020timeout_" +
+      "settings\030\013 \001(\0132\032.gitpod.v1.TimeoutSettin" +
+      "gsH\005R\017timeoutSettings\210\001\001\022L\n\021role_restric" +
+      "tions\030\014 \003(\0132\037.gitpod.v1.RoleRestrictionE" +
+      "ntryR\020roleRestrictions\022=\n\030update_role_re" +
+      "strictions\030\r \001(\010H\006R\026updateRoleRestrictio" +
+      "ns\210\001\001\022J\n\037max_parallel_running_workspaces" +
+      "\030\017 \001(\005H\007R\034maxParallelRunningWorkspaces\210\001" +
+      "\001\022S\n\023onboarding_settings\030\020 \001(\0132\035.gitpod." +
+      "v1.OnboardingSettingsH\010R\022onboardingSetti" +
+      "ngs\210\001\001\0225\n\024annotate_git_commits\030\021 \001(\010H\tR\022" +
+      "annotateGitCommits\210\001\001\032G\n\031PinnedEditorVer" +
+      "sionsEntry\022\020\n\003key\030\001 \001(\tR\003key\022\024\n\005value\030\002 " +
+      "\001(\tR\005value:\0028\001B\035\n\033_workspace_sharing_dis" +
+      "abledB\032\n\030_default_workspace_imageB!\n\037_up" +
+      "date_restricted_editor_namesB \n\036_update_" +
+      "pinned_editor_versionsB\017\n\r_default_roleB" +
+      "\023\n\021_timeout_settingsB\033\n\031_update_role_res" +
+      "trictionsB\"\n _max_parallel_running_works" +
+      "pacesB\026\n\024_onboarding_settingsB\027\n\025_annota" +
+      "te_git_commits\"a\n\"UpdateOrganizationSett" +
+      "ingsResponse\022;\n\010settings\030\001 \001(\0132\037.gitpod." +
+      "v1.OrganizationSettingsR\010settings\"I\n\036Get" +
+      "OrganizationSettingsRequest\022\'\n\017organizat" +
+      "ion_id\030\001 \001(\tR\016organizationId\"^\n\037GetOrgan" +
+      "izationSettingsResponse\022;\n\010settings\030\001 \001(" +
+      "\0132\037.gitpod.v1.OrganizationSettingsR\010sett" +
+      "ings\"/\n\031CreateOrganizationRequest\022\022\n\004nam" +
+      "e\030\001 \001(\tR\004name\"Y\n\032CreateOrganizationRespo" +
+      "nse\022;\n\014organization\030\001 \001(\0132\027.gitpod.v1.Or" +
+      "ganizationR\014organization\"A\n\026GetOrganizat" +
+      "ionRequest\022\'\n\017organization_id\030\001 \001(\tR\016org" +
+      "anizationId\"V\n\027GetOrganizationResponse\022;" +
+      "\n\014organization\030\001 \001(\0132\027.gitpod.v1.Organiz" +
+      "ationR\014organization\"\332\001\n\030ListOrganization" +
+      "sRequest\022<\n\npagination\030\001 \001(\0132\034.gitpod.v1" +
+      ".PaginationRequestR\npagination\022?\n\005scope\030" +
+      "\002 \001(\0162).gitpod.v1.ListOrganizationsReque" +
+      "st.ScopeR\005scope\"?\n\005Scope\022\025\n\021SCOPE_UNSPEC" +
+      "IFIED\020\000\022\020\n\014SCOPE_MEMBER\020\001\022\r\n\tSCOPE_ALL\020\002" +
+      "\"\231\001\n\031ListOrganizationsResponse\022=\n\rorgani" +
+      "zations\030\001 \003(\0132\027.gitpod.v1.OrganizationR\r" +
+      "organizations\022=\n\npagination\030\002 \001(\0132\035.gitp" +
+      "od.v1.PaginationResponseR\npagination\"D\n\031" +
+      "DeleteOrganizationRequest\022\'\n\017organizatio" +
+      "n_id\030\001 \001(\tR\016organizationId\"\034\n\032DeleteOrga" +
+      "nizationResponse\"K\n GetOrganizationInvit" +
+      "ationRequest\022\'\n\017organization_id\030\001 \001(\tR\016o" +
+      "rganizationId\"H\n!GetOrganizationInvitati" +
+      "onResponse\022#\n\rinvitation_id\030\001 \001(\tR\014invit" +
+      "ationId\">\n\027JoinOrganizationRequest\022#\n\rin" +
+      "vitation_id\030\001 \001(\tR\014invitationId\"C\n\030JoinO" +
+      "rganizationResponse\022\'\n\017organization_id\030\001" +
+      " \001(\tR\016organizationId\"M\n\"ResetOrganizatio" +
+      "nInvitationRequest\022\'\n\017organization_id\030\001 " +
+      "\001(\tR\016organizationId\"J\n#ResetOrganization" +
+      "InvitationResponse\022#\n\rinvitation_id\030\001 \001(" +
+      "\tR\014invitationId\"\207\001\n\036ListOrganizationMemb" +
+      "ersRequest\022\'\n\017organization_id\030\001 \001(\tR\016org" +
+      "anizationId\022<\n\npagination\030\002 \001(\0132\034.gitpod" +
+      ".v1.PaginationRequestR\npagination\"\231\001\n\037Li" +
+      "stOrganizationMembersResponse\0227\n\007members" +
+      "\030\001 \003(\0132\035.gitpod.v1.OrganizationMemberR\007m" +
+      "embers\022=\n\npagination\030\002 \001(\0132\035.gitpod.v1.P" +
+      "aginationResponseR\npagination\"\242\001\n\037Update" +
+      "OrganizationMemberRequest\022\'\n\017organizatio" +
+      "n_id\030\001 \001(\tR\016organizationId\022\027\n\007user_id\030\002 " +
+      "\001(\tR\006userId\0224\n\004role\030\003 \001(\0162\033.gitpod.v1.Or" +
+      "ganizationRoleH\000R\004role\210\001\001B\007\n\005_role\"Y\n Up" +
+      "dateOrganizationMemberResponse\0225\n\006member" +
+      "\030\001 \001(\0132\035.gitpod.v1.OrganizationMemberR\006m" +
+      "ember\"c\n\037DeleteOrganizationMemberRequest" +
+      "\022\'\n\017organization_id\030\001 \001(\tR\016organizationI" +
+      "d\022\027\n\007user_id\030\002 \001(\tR\006userId\"\"\n DeleteOrga" +
+      "nizationMemberResponse*\224\001\n\020OrganizationR" +
+      "ole\022!\n\035ORGANIZATION_ROLE_UNSPECIFIED\020\000\022\033" +
+      "\n\027ORGANIZATION_ROLE_OWNER\020\001\022\034\n\030ORGANIZAT" +
+      "ION_ROLE_MEMBER\020\002\022\"\n\036ORGANIZATION_ROLE_C" +
+      "OLLABORATOR\020\003*t\n\026OrganizationPermission\022" +
+      "\'\n#ORGANIZATION_PERMISSION_UNSPECIFIED\020\000" +
+      "\0221\n-ORGANIZATION_PERMISSION_START_ARBITR" +
+      "ARY_REPOS\020\0012\276\014\n\023OrganizationService\022c\n\022C" +
+      "reateOrganization\022$.gitpod.v1.CreateOrga" +
+      "nizationRequest\032%.gitpod.v1.CreateOrgani" +
+      "zationResponse\"\000\022Z\n\017GetOrganization\022!.gi" +
+      "tpod.v1.GetOrganizationRequest\032\".gitpod." +
+      "v1.GetOrganizationResponse\"\000\022c\n\022UpdateOr" +
+      "ganization\022$.gitpod.v1.UpdateOrganizatio" +
+      "nRequest\032%.gitpod.v1.UpdateOrganizationR" +
+      "esponse\"\000\022`\n\021ListOrganizations\022#.gitpod." +
+      "v1.ListOrganizationsRequest\032$.gitpod.v1." +
+      "ListOrganizationsResponse\"\000\022c\n\022DeleteOrg" +
+      "anization\022$.gitpod.v1.DeleteOrganization" +
+      "Request\032%.gitpod.v1.DeleteOrganizationRe" +
+      "sponse\"\000\022x\n\031GetOrganizationInvitation\022+." +
+      "gitpod.v1.GetOrganizationInvitationReque" +
+      "st\032,.gitpod.v1.GetOrganizationInvitation" +
+      "Response\"\000\022]\n\020JoinOrganization\022\".gitpod." +
+      "v1.JoinOrganizationRequest\032#.gitpod.v1.J" +
+      "oinOrganizationResponse\"\000\022~\n\033ResetOrgani" +
+      "zationInvitation\022-.gitpod.v1.ResetOrgani" +
+      "zationInvitationRequest\032..gitpod.v1.Rese" +
+      "tOrganizationInvitationResponse\"\000\022r\n\027Lis" +
+      "tOrganizationMembers\022).gitpod.v1.ListOrg" +
+      "anizationMembersRequest\032*.gitpod.v1.List" +
+      "OrganizationMembersResponse\"\000\022u\n\030UpdateO" +
+      "rganizationMember\022*.gitpod.v1.UpdateOrga" +
+      "nizationMemberRequest\032+.gitpod.v1.Update" +
+      "OrganizationMemberResponse\"\000\022u\n\030DeleteOr" +
+      "ganizationMember\022*.gitpod.v1.DeleteOrgan" +
+      "izationMemberRequest\032+.gitpod.v1.DeleteO" +
+      "rganizationMemberResponse\"\000\022r\n\027GetOrgani" +
+      "zationSettings\022).gitpod.v1.GetOrganizati" +
+      "onSettingsRequest\032*.gitpod.v1.GetOrganiz" +
+      "ationSettingsResponse\"\000\022{\n\032UpdateOrganiz" +
+      "ationSettings\022,.gitpod.v1.UpdateOrganiza" +
+      "tionSettingsRequest\032-.gitpod.v1.UpdateOr" +
+      "ganizationSettingsResponse\"\000\022\215\001\n ListOrg" +
+      "anizationWorkspaceClasses\0222.gitpod.v1.Li" +
+      "stOrganizationWorkspaceClassesRequest\0323." +
+      "gitpod.v1.ListOrganizationWorkspaceClass" +
+      "esResponse\"\000BQ\n\026io.gitpod.publicapi.v1Z7" +
+      "github.com/gitpod-io/gitpod/components/p" +
+      "ublic-api/go/v1b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -29619,7 +31298,13 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.DeleteOrganizationMemberRes
     internal_static_gitpod_v1_OnboardingSettings_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_gitpod_v1_OnboardingSettings_descriptor,
-        new java.lang.String[] { "InternalLink", "RecommendedRepositories", });
+        new java.lang.String[] { "InternalLink", "RecommendedRepositories", "UpdateRecommendedRepositories", "WelcomeMessage", });
+    internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_descriptor =
+      internal_static_gitpod_v1_OnboardingSettings_descriptor.getNestedTypes().get(0);
+    internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_gitpod_v1_OnboardingSettings_WelcomeMessage_descriptor,
+        new java.lang.String[] { "Enabled", "Message", "FeaturedMemberId", "FeaturedMemberResolvedAvatarUrl", });
     internal_static_gitpod_v1_OrganizationSettings_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_gitpod_v1_OrganizationSettings_fieldAccessorTable = new
diff --git a/components/public-api/typescript-common/src/public-api-converter.ts b/components/public-api/typescript-common/src/public-api-converter.ts
index 10e62f954597d8..1ab4fd5f08774f 100644
--- a/components/public-api/typescript-common/src/public-api-converter.ts
+++ b/components/public-api/typescript-common/src/public-api-converter.ts
@@ -1145,6 +1145,7 @@ export class PublicAPIConverter {
             maxParallelRunningWorkspaces: settings.maxParallelRunningWorkspaces ?? 0,
             onboardingSettings: {
                 internalLink: settings?.onboardingSettings?.internalLink ?? undefined,
+                welcomeMessage: settings?.onboardingSettings?.welcomeMessage ?? undefined,
                 recommendedRepositories: settings?.onboardingSettings?.recommendedRepositories ?? [],
             },
             annotateGitCommits: settings.annotateGitCommits ?? false,
diff --git a/components/public-api/typescript/src/gitpod/v1/organization_pb.ts b/components/public-api/typescript/src/gitpod/v1/organization_pb.ts
index 6febfa566c972d..f40fdae1b3d2eb 100644
--- a/components/public-api/typescript/src/gitpod/v1/organization_pb.ts
+++ b/components/public-api/typescript/src/gitpod/v1/organization_pb.ts
@@ -47,7 +47,8 @@ proto3.util.setEnumType(OrganizationRole, "gitpod.v1.OrganizationRole", [
 ]);
 
 /**
- * OrganizationPermissions define permissions that are restrictable using RoleRestrictions
+ * OrganizationPermissions define permissions that are restrictable using
+ * RoleRestrictions
  *
  * @generated from enum gitpod.v1.OrganizationPermission
  */
@@ -244,23 +245,44 @@ export class RoleRestrictionEntry extends Message<RoleRestrictionEntry> {
 }
 
 /**
+ * onboarding_settings are the settings for the organization's onboarding
+ *
  * @generated from message gitpod.v1.OnboardingSettings
  */
 export class OnboardingSettings extends Message<OnboardingSettings> {
   /**
-   * internal_link is the link to an internal onboarding page for the organization, possibly featuring a custom onboarding guide and other resources
+   * internal_link is the link to an internal onboarding page for the
+   * organization, possibly featuring a custom onboarding guide and other
+   * resources
    *
    * @generated from field: optional string internal_link = 1;
    */
   internalLink?: string;
 
   /**
-   * recommended_repositories are the repositories that are recommended for new org members
+   * recommended_repositories are the repositories that are recommended for new
+   * org members
    *
    * @generated from field: repeated string recommended_repositories = 2;
    */
   recommendedRepositories: string[] = [];
 
+  /**
+   * update_recommended_repositories specifies whether recommended_repositories
+   * should be updated.
+   * This field **will not** be specified in server responses.
+   *
+   * @generated from field: optional bool update_recommended_repositories = 3;
+   */
+  updateRecommendedRepositories?: boolean;
+
+  /**
+   * welcome_message is the welcome message for the organization
+   *
+   * @generated from field: optional gitpod.v1.OnboardingSettings.WelcomeMessage welcome_message = 4;
+   */
+  welcomeMessage?: OnboardingSettings_WelcomeMessage;
+
   constructor(data?: PartialMessage<OnboardingSettings>) {
     super();
     proto3.util.initPartial(data, this);
@@ -271,6 +293,8 @@ export class OnboardingSettings extends Message<OnboardingSettings> {
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "internal_link", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 2, name: "recommended_repositories", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
+    { no: 3, name: "update_recommended_repositories", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
+    { no: 4, name: "welcome_message", kind: "message", T: OnboardingSettings_WelcomeMessage, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): OnboardingSettings {
@@ -290,6 +314,71 @@ export class OnboardingSettings extends Message<OnboardingSettings> {
   }
 }
 
+/**
+ * @generated from message gitpod.v1.OnboardingSettings.WelcomeMessage
+ */
+export class OnboardingSettings_WelcomeMessage extends Message<OnboardingSettings_WelcomeMessage> {
+  /**
+   * enabled specifies whether the welcome message is enabled
+   *
+   * @generated from field: bool enabled = 1;
+   */
+  enabled = false;
+
+  /**
+   * message is the welcome message for the organization
+   *
+   * @generated from field: optional string message = 2;
+   */
+  message?: string;
+
+  /**
+   * featured_member_id is the ID of the member to show in the welcome message
+   *
+   * @generated from field: optional string featured_member_id = 4;
+   */
+  featuredMemberId?: string;
+
+  /**
+   * featured_member_resolved_avatar_url is the avatar URL that is resolved
+   * from the featured_member_id by the server
+   * This field **can not** be set in the request.
+   *
+   * @generated from field: optional string featured_member_resolved_avatar_url = 5;
+   */
+  featuredMemberResolvedAvatarUrl?: string;
+
+  constructor(data?: PartialMessage<OnboardingSettings_WelcomeMessage>) {
+    super();
+    proto3.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto3 = proto3;
+  static readonly typeName = "gitpod.v1.OnboardingSettings.WelcomeMessage";
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: "enabled", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 2, name: "message", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 4, name: "featured_member_id", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 5, name: "featured_member_resolved_avatar_url", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): OnboardingSettings_WelcomeMessage {
+    return new OnboardingSettings_WelcomeMessage().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): OnboardingSettings_WelcomeMessage {
+    return new OnboardingSettings_WelcomeMessage().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): OnboardingSettings_WelcomeMessage {
+    return new OnboardingSettings_WelcomeMessage().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: OnboardingSettings_WelcomeMessage | PlainMessage<OnboardingSettings_WelcomeMessage> | undefined, b: OnboardingSettings_WelcomeMessage | PlainMessage<OnboardingSettings_WelcomeMessage> | undefined): boolean {
+    return proto3.util.equals(OnboardingSettings_WelcomeMessage, a, b);
+  }
+}
+
 /**
  * @generated from message gitpod.v1.OrganizationSettings
  */
@@ -335,7 +424,9 @@ export class OrganizationSettings extends Message<OrganizationSettings> {
   roleRestrictions: RoleRestrictionEntry[] = [];
 
   /**
-   * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+   * max_parallel_running_workspaces is the maximum number of workspaces that a
+   * single user can run in parallel. 0 resets to the default, which depends on
+   * the org plan
    *
    * @generated from field: int32 max_parallel_running_workspaces = 9;
    */
@@ -575,7 +666,8 @@ export class TimeoutSettings extends Message<TimeoutSettings> {
   inactivity?: Duration;
 
   /**
-   * deny_user_timeout specifies whether applying custom timeouts is denied for organization members
+   * deny_user_timeout specifies whether applying custom timeouts is denied for
+   * organization members
    *
    * @generated from field: optional bool deny_user_timeouts = 2;
    */
@@ -694,14 +786,17 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
   roleRestrictions: RoleRestrictionEntry[] = [];
 
   /**
-   * update_role_restrictions specifies whether role_restrictions should be updated
+   * update_role_restrictions specifies whether role_restrictions should be
+   * updated
    *
    * @generated from field: optional bool update_role_restrictions = 13;
    */
   updateRoleRestrictions?: boolean;
 
   /**
-   * max_parallel_running_workspaces is the maximum number of workspaces that a single user can run in parallel. 0 resets to the default, which depends on the org plan
+   * max_parallel_running_workspaces is the maximum number of workspaces that a
+   * single user can run in parallel. 0 resets to the default, which depends on
+   * the org plan
    *
    * @generated from field: optional int32 max_parallel_running_workspaces = 15;
    */
@@ -715,7 +810,8 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
   onboardingSettings?: OnboardingSettings;
 
   /**
-   * annotate_git_commits specifies whether to annotate git commits created in Gitpod workspaces with the gitpod host
+   * annotate_git_commits specifies whether to annotate git commits created in
+   * Gitpod workspaces with the gitpod host
    *
    * @generated from field: optional bool annotate_git_commits = 17;
    */
diff --git a/components/server/package.json b/components/server/package.json
index c3dd992d6665d4..18c6ed06a0202c 100644
--- a/components/server/package.json
+++ b/components/server/package.json
@@ -153,7 +153,7 @@
     "standard": "^17.1.0",
     "supertest": "^6.3.3",
     "ts-node": "^10.4.0",
-    "typescript": "~4.4.2",
+    "typescript": "^5.7.3",
     "watch": "^1.0.2"
   }
 }
diff --git a/components/server/src/api/organization-service-api.ts b/components/server/src/api/organization-service-api.ts
index a1d19e2dbaf2c6..766f6a9c00bcdf 100644
--- a/components/server/src/api/organization-service-api.ts
+++ b/components/server/src/api/organization-service-api.ts
@@ -188,7 +188,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "organizationId is required");
         }
 
-        const members = await this.orgService.listMembers(ctxUserId(), req.organizationId);
+        const members = await this.orgService.listMembers(ctxUserId(), req.organizationId, true);
         //TODO pagination
         const response = new ListOrganizationMembersResponse();
         response.members = members.map((member) => this.apiConverter.toOrganizationMember(member));
@@ -218,7 +218,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             this.apiConverter.fromOrgMemberRole(req.role),
         );
         const member = await this.orgService
-            .listMembers(ctxUserId(), req.organizationId)
+            .listMembers(ctxUserId(), req.organizationId, true)
             .then((members) => members.find((member) => member.userId === req.userId));
         return new UpdateOrganizationMemberResponse({
             member: member && this.apiConverter.toOrganizationMember(member),
@@ -251,6 +251,20 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
         const settings = await this.orgService.getSettings(ctxUserId(), req.organizationId);
         const response = new GetOrganizationSettingsResponse();
         response.settings = this.apiConverter.toOrganizationSettings(settings);
+
+        // resolve the avatar URL for the featured member in the welcome message
+        const onboardingWelcomeMessageFeaturedMemberId =
+            response.settings.onboardingSettings?.welcomeMessage?.featuredMemberId;
+        if (onboardingWelcomeMessageFeaturedMemberId) {
+            const member = await this.orgService
+                .getOrganizationMember(ctxUserId(), req.organizationId, onboardingWelcomeMessageFeaturedMemberId, true)
+                .catch(() => undefined);
+            if (member?.user.avatarUrl && response?.settings?.onboardingSettings?.welcomeMessage) {
+                response.settings.onboardingSettings.welcomeMessage.featuredMemberResolvedAvatarUrl =
+                    member.user.avatarUrl;
+            }
+        }
+
         return response;
     }
 
@@ -341,17 +355,44 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
         }
 
         if (req.onboardingSettings && Object.keys(req.onboardingSettings).length > 0) {
+            update.onboardingSettings = {};
+
             if (!this.config.isDedicatedInstallation) {
                 throw new ApplicationError(
                     ErrorCodes.BAD_REQUEST,
                     "onboardingSettings can only be set on enterprise installations",
                 );
             }
-            if ((req.onboardingSettings.internalLink?.length ?? 0) > 255) {
-                throw new ApplicationError(ErrorCodes.BAD_REQUEST, "internalLink must be <= 255 characters");
+
+            if (req.onboardingSettings.welcomeMessage?.featuredMemberResolvedAvatarUrl) {
+                throw new ApplicationError(
+                    ErrorCodes.BAD_REQUEST,
+                    "featuredMemberResolvedAvatarUrl is not allowed to be set",
+                );
+            }
+
+            if (req.onboardingSettings.internalLink) {
+                if (req.onboardingSettings.internalLink.length > 255) {
+                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "internalLink must be <= 255 characters long");
+                }
+
+                update.onboardingSettings.internalLink = req.onboardingSettings.internalLink;
+            }
+
+            if (
+                !req.onboardingSettings.updateRecommendedRepositories &&
+                req.onboardingSettings.recommendedRepositories.length > 0
+            ) {
+                throw new ApplicationError(
+                    ErrorCodes.BAD_REQUEST,
+                    "recommendedRepositories can only be set when updateRecommendedRepositories is true",
+                );
             }
 
-            if (req.onboardingSettings.recommendedRepositories) {
+            if (
+                req.onboardingSettings.updateRecommendedRepositories &&
+                req.onboardingSettings.recommendedRepositories
+            ) {
                 if (req.onboardingSettings.recommendedRepositories.length > 3) {
                     throw new ApplicationError(
                         ErrorCodes.BAD_REQUEST,
@@ -368,9 +409,43 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
                         throw new ApplicationError(ErrorCodes.BAD_REQUEST, `repository ${configurationId} not found`);
                     }
                 }
+
+                update.onboardingSettings.recommendedRepositories = req.onboardingSettings.recommendedRepositories;
+            }
+
+            if (
+                req.onboardingSettings.welcomeMessage &&
+                Object.keys(req.onboardingSettings.welcomeMessage).length > 0
+            ) {
+                if (req.onboardingSettings.welcomeMessage.featuredMemberId) {
+                    const member = await this.orgService
+                        .getOrganizationMember(
+                            ctxUserId(),
+                            req.organizationId,
+                            req.onboardingSettings.welcomeMessage.featuredMemberId,
+                            true,
+                        )
+                        .catch(() => undefined);
+                    if (!member) {
+                        throw new ApplicationError(ErrorCodes.BAD_REQUEST, "featuredMemberId not found");
+                    }
+                }
+
+                if (
+                    req.onboardingSettings.welcomeMessage.enabled &&
+                    req.onboardingSettings.welcomeMessage.message?.length === 0
+                ) {
+                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "welcomeMessage must not be empty when enabled");
+                }
+
+                update.onboardingSettings.welcomeMessage = req.onboardingSettings.welcomeMessage;
             }
 
-            update.onboardingSettings = req.onboardingSettings;
+            const existingOnboardingSettings = await this.orgService.getSettings(ctxUserId(), req.organizationId);
+            update.onboardingSettings = {
+                ...existingOnboardingSettings.onboardingSettings,
+                ...update.onboardingSettings,
+            };
         }
         if (req.annotateGitCommits !== undefined) {
             update.annotateGitCommits = req.annotateGitCommits;
diff --git a/components/server/src/orgs/organization-service.ts b/components/server/src/orgs/organization-service.ts
index e3a7375a9ba4d1..67c13d25bace85 100644
--- a/components/server/src/orgs/organization-service.ts
+++ b/components/server/src/orgs/organization-service.ts
@@ -36,6 +36,7 @@ import { UsageService } from "./usage-service";
 import { CostCenter_BillingStrategy } from "@gitpod/gitpod-protocol/lib/usage";
 import { CreateUserParams, UserAuthentication } from "../user/user-authentication";
 import isURL from "validator/lib/isURL";
+import { DBTeamMembership } from "@gitpod/gitpod-db/lib/typeorm/entity/db-team-membership";
 
 @injectable()
 export class OrganizationService {
@@ -118,6 +119,32 @@ export class OrganizationService {
         return result;
     }
 
+    async getOrganizationMember(
+        userId: string,
+        orgId: string,
+        memberId: string,
+        skipPermissionCheck?: boolean,
+    ): Promise<DBTeamMembership & { user: User }> {
+        if (!skipPermissionCheck) {
+            await this.auth.checkPermissionOnOrganization(userId, "read_members", orgId);
+        }
+
+        const membership = await this.teamDB.findTeamMembership(memberId, orgId);
+        if (!membership) {
+            throw new ApplicationError(ErrorCodes.NOT_FOUND, `Organization member ${memberId} not found`);
+        }
+
+        const user = await this.userDB.findUserById(memberId);
+        if (!user) {
+            throw new ApplicationError(ErrorCodes.NOT_FOUND, `User ${memberId} not found`);
+        }
+
+        return {
+            ...membership,
+            user,
+        };
+    }
+
     async listOrganizationsByMember(userId: string, memberId: string): Promise<Organization[]> {
         await this.auth.checkPermissionOnUser(userId, "read_info", memberId);
         const orgs = await this.teamDB.findTeamsByUser(memberId);
@@ -235,19 +262,38 @@ export class OrganizationService {
         }
     }
 
-    public async listMembers(userId: string, orgId: string): Promise<OrgMemberInfo[]> {
+    /**
+     * List members of an organization, excluding all deleted users and optionally the built-in installation admin user.
+     */
+    public async listMembers(
+        userId: string,
+        orgId: string,
+        excludeInstallationAdmin?: boolean,
+    ): Promise<OrgMemberInfo[]> {
         await this.auth.checkPermissionOnOrganization(userId, "read_members", orgId);
         const members = await this.teamDB.findMembersByTeam(orgId);
 
-        // TODO(at) remove this workaround once email addresses are persisted under `User.emails`.
-        // For now we're avoiding adding `getPrimaryEmail` as dependency to `gitpod-db` module.
-        for (const member of members) {
-            const user = await this.userDB.findUserById(member.userId);
-            if (user) {
-                member.primaryEmail = getPrimaryEmail(user);
-            }
-        }
-        return members;
+        const filteredMembers = await Promise.all(
+            members.map(async (member) => {
+                // TODO(at) remove this workaround once email addresses are persisted under `User.emails`.
+                // For now we're avoiding adding `getPrimaryEmail` as dependency to `gitpod-db` module.
+                const user = await this.userDB.findUserById(member.userId);
+                if (user) {
+                    if (user.markedDeleted) {
+                        return null;
+                    }
+                    if (excludeInstallationAdmin && user.id === BUILTIN_INSTLLATION_ADMIN_USER_ID) {
+                        return null;
+                    }
+
+                    member.primaryEmail = getPrimaryEmail(user);
+                }
+
+                return member;
+            }),
+        );
+
+        return filteredMembers.filter((m) => !!m);
     }
 
     public async getOrCreateInvite(userId: string, orgId: string): Promise<TeamMembershipInvite> {
diff --git a/yarn.lock b/yarn.lock
index 032bf7a647f937..9c0979ec846e10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3480,6 +3480,13 @@
   resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
+"@types/debug@^4.0.0":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
+  integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/deep-equal-in-any-order@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/deep-equal-in-any-order/-/deep-equal-in-any-order-1.0.1.tgz#0559d855797a5034e187f248b23a4490e5444f2e"
@@ -3514,6 +3521,13 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
+"@types/estree-jsx@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
+  integrity sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/estree@*":
   version "0.0.50"
   resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"
@@ -3636,6 +3650,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/hast@^3.0.0":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
+  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/history@*":
   version "4.7.9"
   resolved "https://registry.npmjs.org/@types/history/-/history-4.7.9.tgz"
@@ -3803,6 +3824,13 @@
     "@types/linkify-it" "*"
     "@types/mdurl" "*"
 
+"@types/mdast@^4.0.0":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.4.tgz#7ccf72edd2f1aa7dd3437e180c64373585804dd6"
+  integrity sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/mdurl@*":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
@@ -3833,6 +3861,11 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.1.tgz#2f4f65bb08bc368ac39c96da7b2f09140b26851b"
   integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==
 
+"@types/ms@*":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
+  integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
+
 "@types/mysql@^2.15.0":
   version "2.15.19"
   resolved "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.19.tgz"
@@ -4152,6 +4185,16 @@
   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz#832c58e460c9435e4e34bb866e85e9146e12cdbb"
   integrity sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==
 
+"@types/unist@*", "@types/unist@^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c"
+  integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==
+
+"@types/unist@^2.0.0":
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
+  integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
+
 "@types/uuid@8.3.1", "@types/uuid@^8.3.1":
   version "8.3.1"
   resolved "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz"
@@ -4311,6 +4354,11 @@
   dependencies:
     debug "^4.1.1"
 
+"@ungap/structured-clone@^1.0.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
@@ -5191,6 +5239,11 @@ babel-preset-react-app@^10.0.1:
     babel-plugin-macros "^3.1.0"
     babel-plugin-transform-react-remove-prop-types "^0.4.24"
 
+bail@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
+  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -5645,6 +5698,11 @@ catharsis@^0.9.0:
   dependencies:
     lodash "^4.17.15"
 
+ccount@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
+  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
+
 chai-http@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/chai-http/-/chai-http-4.3.0.tgz"
@@ -5721,6 +5779,26 @@ char-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.1.tgz#6dafdb25f9d3349914079f010ba8d0e6ff9cd01e"
   integrity sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==
 
+character-entities-html4@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b"
+  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==
+
+character-entities-legacy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
+  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
+
+character-entities@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
+  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
+
+character-reference-invalid@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
+  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
+
 charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
@@ -5932,6 +6010,11 @@ combined-stream@^1.0.6, combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
+  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
+
 commander@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
@@ -6583,6 +6666,13 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  dependencies:
+    ms "^2.1.3"
+
 debug@^4.1.0, debug@^4.3.1:
   version "4.3.2"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"
@@ -6607,6 +6697,13 @@ decimal.js@^10.2.1:
   resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz"
   integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
+decode-named-character-reference@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
+  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
+  dependencies:
+    character-entities "^2.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
@@ -6734,7 +6831,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
   resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
-dequal@^2.0.2, dequal@^2.0.3:
+dequal@^2.0.0, dequal@^2.0.2, dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
@@ -6793,6 +6890,13 @@ detect-port-alt@^1.1.6:
     address "^1.0.1"
     debug "^2.6.0"
 
+devlop@^1.0.0, devlop@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
+  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
+  dependencies:
+    dequal "^2.0.0"
+
 dezalgo@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
@@ -7732,6 +7836,11 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-util-is-identifier-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz#0b5ef4c4ff13508b34dcd01ecfa945f61fce5dbd"
+  integrity sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==
+
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
@@ -8871,6 +8980,34 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
+hast-util-to-jsx-runtime@^2.0.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.2.tgz#6d11b027473e69adeaa00ca4cfb5bb68e3d282fa"
+  integrity sha512-1ngXYb+V9UT5h+PxNRa1O1FYguZK/XL+gkeqvp7EdHlB9oHUG0eYRo/vY5inBdcqo3RkPMC58/H94HvkbfGdyg==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/unist" "^3.0.0"
+    comma-separated-tokens "^2.0.0"
+    devlop "^1.0.0"
+    estree-util-is-identifier-name "^3.0.0"
+    hast-util-whitespace "^3.0.0"
+    mdast-util-mdx-expression "^2.0.0"
+    mdast-util-mdx-jsx "^3.0.0"
+    mdast-util-mdxjs-esm "^2.0.0"
+    property-information "^6.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^1.0.0"
+    unist-util-position "^5.0.0"
+    vfile-message "^4.0.0"
+
+hast-util-whitespace@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz#7778ed9d3c92dd9e8c5c8f648a49c21fc51cb621"
+  integrity sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==
+  dependencies:
+    "@types/hast" "^3.0.0"
+
 he@1.2.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
@@ -8974,6 +9111,11 @@ html-minifier-terser@^6.0.2:
     relateurl "^0.2.7"
     terser "^5.10.0"
 
+html-url-attributes@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/html-url-attributes/-/html-url-attributes-3.0.1.tgz#83b052cd5e437071b756cd74ae70f708870c2d87"
+  integrity sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==
+
 html-webpack-plugin@^5.5.0:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz#72270f4a78e222b5825b296e5e3e1328ad525a3e"
@@ -9219,6 +9361,11 @@ ini@^1.3.5:
   resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
+inline-style-parser@0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.4.tgz#f4af5fe72e612839fcd453d989a586566d695f22"
+  integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==
+
 internal-slot@^1.0.3, internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
@@ -9303,6 +9450,19 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
+is-alphabetical@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.1.tgz#01072053ea7c1036df3c7d19a6daaec7f19e789b"
+  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==
+
+is-alphanumerical@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz#7c03fbe96e3e931113e57f964b0a368cc2dfd875"
+  integrity sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==
+  dependencies:
+    is-alphabetical "^2.0.0"
+    is-decimal "^2.0.0"
+
 is-arguments@^1.0.4, is-arguments@^1.1.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"
@@ -9407,6 +9567,11 @@ is-date-object@^1.0.1, is-date-object@^1.0.2, is-date-object@^1.0.5:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-decimal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
+  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
+
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
@@ -9475,6 +9640,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-hexadecimal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
+  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
+
 is-ip@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz"
@@ -9539,6 +9709,11 @@ is-plain-obj@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
+is-plain-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
+  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
+
 is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
@@ -10845,6 +11020,11 @@ long@^5.0.0, long@^5.2.3:
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
   integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
 
+longest-streak@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
+  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
+
 longjohn@^0.2.12:
   version "0.2.12"
   resolved "https://registry.npmjs.org/longjohn/-/longjohn-0.2.12.tgz"
@@ -10968,6 +11148,111 @@ md5@^2.2.1:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
+mdast-util-from-markdown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz#4850390ca7cf17413a9b9a0fbefcd1bc0eb4160a"
+  integrity sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    "@types/unist" "^3.0.0"
+    decode-named-character-reference "^1.0.0"
+    devlop "^1.0.0"
+    mdast-util-to-string "^4.0.0"
+    micromark "^4.0.0"
+    micromark-util-decode-numeric-character-reference "^2.0.0"
+    micromark-util-decode-string "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+    unist-util-stringify-position "^4.0.0"
+
+mdast-util-mdx-expression@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz#43f0abac9adc756e2086f63822a38c8d3c3a5096"
+  integrity sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    devlop "^1.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-mdx-jsx@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.2.0.tgz#fd04c67a2a7499efb905a8a5c578dddc9fdada0d"
+  integrity sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    "@types/unist" "^3.0.0"
+    ccount "^2.0.0"
+    devlop "^1.1.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+    parse-entities "^4.0.0"
+    stringify-entities "^4.0.0"
+    unist-util-stringify-position "^4.0.0"
+    vfile-message "^4.0.0"
+
+mdast-util-mdxjs-esm@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz#019cfbe757ad62dd557db35a695e7314bcc9fa97"
+  integrity sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    devlop "^1.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-phrasing@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz#7cc0a8dec30eaf04b7b1a9661a92adb3382aa6e3"
+  integrity sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    unist-util-is "^6.0.0"
+
+mdast-util-to-hast@^13.0.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4"
+  integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==
+  dependencies:
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    "@ungap/structured-clone" "^1.0.0"
+    devlop "^1.0.0"
+    micromark-util-sanitize-uri "^2.0.0"
+    trim-lines "^3.0.0"
+    unist-util-position "^5.0.0"
+    unist-util-visit "^5.0.0"
+    vfile "^6.0.0"
+
+mdast-util-to-markdown@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz#f910ffe60897f04bb4b7e7ee434486f76288361b"
+  integrity sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    "@types/unist" "^3.0.0"
+    longest-streak "^3.0.0"
+    mdast-util-phrasing "^4.0.0"
+    mdast-util-to-string "^4.0.0"
+    micromark-util-classify-character "^2.0.0"
+    micromark-util-decode-string "^2.0.0"
+    unist-util-visit "^5.0.0"
+    zwitch "^2.0.0"
+
+mdast-util-to-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz#7a5121475556a04e7eddeb67b264aae79d312814"
+  integrity sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"
@@ -11035,6 +11320,200 @@ methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
   resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
+micromark-core-commonmark@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-2.0.2.tgz#6a45bbb139e126b3f8b361a10711ccc7c6e15e93"
+  integrity sha512-FKjQKbxd1cibWMM1P9N+H8TwlgGgSkWZMmfuVucLCHaYqeSvJ0hFeHsIa65pA2nYbes0f8LDHPMrd9X7Ujxg9w==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    devlop "^1.0.0"
+    micromark-factory-destination "^2.0.0"
+    micromark-factory-label "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-factory-title "^2.0.0"
+    micromark-factory-whitespace "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-classify-character "^2.0.0"
+    micromark-util-html-tag-name "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-resolve-all "^2.0.0"
+    micromark-util-subtokenize "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-destination@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz#8fef8e0f7081f0474fbdd92deb50c990a0264639"
+  integrity sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-label@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz#5267efa97f1e5254efc7f20b459a38cb21058ba1"
+  integrity sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-space@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz#36d0212e962b2b3121f8525fc7a3c7c029f334fc"
+  integrity sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-title@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz#237e4aa5d58a95863f01032d9ee9b090f1de6e94"
+  integrity sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==
+  dependencies:
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-whitespace@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz#06b26b2983c4d27bfcc657b33e25134d4868b0b1"
+  integrity sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==
+  dependencies:
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-character@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.1.tgz#2f987831a40d4c510ac261e89852c4e9703ccda6"
+  integrity sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-chunked@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz#47fbcd93471a3fccab86cff03847fc3552db1051"
+  integrity sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-classify-character@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz#d399faf9c45ca14c8b4be98b1ea481bced87b629"
+  integrity sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-combine-extensions@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz#2a0f490ab08bff5cc2fd5eec6dd0ca04f89b30a9"
+  integrity sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==
+  dependencies:
+    micromark-util-chunked "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-decode-numeric-character-reference@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz#fcf15b660979388e6f118cdb6bf7d79d73d26fe5"
+  integrity sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-decode-string@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz#6cb99582e5d271e84efca8e61a807994d7161eb2"
+  integrity sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-decode-numeric-character-reference "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-encode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz#0d51d1c095551cfaac368326963cf55f15f540b8"
+  integrity sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==
+
+micromark-util-html-tag-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz#e40403096481986b41c106627f98f72d4d10b825"
+  integrity sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==
+
+micromark-util-normalize-identifier@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz#c30d77b2e832acf6526f8bf1aa47bc9c9438c16d"
+  integrity sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-resolve-all@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz#e1a2d62cdd237230a2ae11839027b19381e31e8b"
+  integrity sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==
+  dependencies:
+    micromark-util-types "^2.0.0"
+
+micromark-util-sanitize-uri@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz#ab89789b818a58752b73d6b55238621b7faa8fd7"
+  integrity sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-encode "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-subtokenize@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.4.tgz#50d8ca981373c717f497dc64a0dbfccce6c03ed2"
+  integrity sha512-N6hXjrin2GTJDe3MVjf5FuXpm12PGm80BrUAeub9XFXca8JZbP+oIwY4LJSVwFUCL1IPm/WwSVUN7goFHmSGGQ==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-symbol@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz#e5da494e8eb2b071a0d08fb34f6cefec6c0a19b8"
+  integrity sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==
+
+micromark-util-types@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.1.tgz#a3edfda3022c6c6b55bfb049ef5b75d70af50709"
+  integrity sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==
+
+micromark@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-4.0.1.tgz#294c2f12364759e5f9e925a767ae3dfde72223ff"
+  integrity sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==
+  dependencies:
+    "@types/debug" "^4.0.0"
+    debug "^4.0.0"
+    decode-named-character-reference "^1.0.0"
+    devlop "^1.0.0"
+    micromark-core-commonmark "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-combine-extensions "^2.0.0"
+    micromark-util-decode-numeric-character-reference "^2.0.0"
+    micromark-util-encode "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-resolve-all "^2.0.0"
+    micromark-util-sanitize-uri "^2.0.0"
+    micromark-util-subtokenize "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
 micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
@@ -11827,6 +12306,19 @@ parse-duration@^1.0.3:
   resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.0.3.tgz#b6681f5edcc2689643b34c09ea63f86f58a35814"
   integrity sha512-o6NAh12na5VvR6nFejkU0gpQ8jmOY9Y9sTU2ke3L3G/d/3z8jqmbBbeyBGHU73P4JLXfc7tJARygIK3WGIkloA==
 
+parse-entities@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.2.tgz#61d46f5ed28e4ee62e9ddc43d6b010188443f159"
+  integrity sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    character-entities-legacy "^3.0.0"
+    character-reference-invalid "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    is-alphanumerical "^2.0.0"
+    is-decimal "^2.0.0"
+    is-hexadecimal "^2.0.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"
@@ -12897,6 +13389,11 @@ prop-types@^15.6.2:
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+property-information@^6.0.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.5.0.tgz#6212fbb52ba757e92ef4fb9d657563b933b7ffec"
+  integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==
+
 proto3-json-serializer@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331"
@@ -13317,6 +13814,22 @@ react-linkedin-login-oauth2@^2.0.1:
   resolved "https://registry.yarnpkg.com/react-linkedin-login-oauth2/-/react-linkedin-login-oauth2-2.0.1.tgz#e322245b69f3248bf68273aa0a0deeed2ddf859d"
   integrity sha512-vlmChbRhLjWZVU/A96I09GcpH3xLFTawQbT/05Dl3kuLVupdaVo7YZf2qrDQmrdfDm4Qj8svX1gkwHkybAMKDg==
 
+react-markdown@^9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-9.0.3.tgz#c12bf60dad05e9bf650b86bcc612d80636e8456e"
+  integrity sha512-Yk7Z94dbgYTOrdk41Z74GoKA7rThnsbbqBTRYuxoe08qvfQ9tJVhmAKw6BJS/ZORG7kTy/s1QvYzSuaoBA1qfw==
+  dependencies:
+    "@types/hast" "^3.0.0"
+    devlop "^1.0.0"
+    hast-util-to-jsx-runtime "^2.0.0"
+    html-url-attributes "^3.0.0"
+    mdast-util-to-hast "^13.0.0"
+    remark-parse "^11.0.0"
+    remark-rehype "^11.0.0"
+    unified "^11.0.0"
+    unist-util-visit "^5.0.0"
+    vfile "^6.0.0"
+
 react-onclickoutside@^6.13.0:
   version "6.13.1"
   resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.13.1.tgz#1f5e0241c08784b6e65745d91aca0d700c548a89"
@@ -13694,6 +14207,27 @@ relateurl@^0.2.7:
   resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
+remark-parse@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-11.0.0.tgz#aa60743fcb37ebf6b069204eb4da304e40db45a1"
+  integrity sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    micromark-util-types "^2.0.0"
+    unified "^11.0.0"
+
+remark-rehype@^11.0.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-11.1.1.tgz#f864dd2947889a11997c0a2667cd6b38f685bca7"
+  integrity sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==
+  dependencies:
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    mdast-util-to-hast "^13.0.0"
+    unified "^11.0.0"
+    vfile "^6.0.0"
+
 remove-accents@0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
@@ -14359,6 +14893,11 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
+space-separated-tokens@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
+  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
+
 spawn-command@^0.0.2-1:
   version "0.0.2-1"
   resolved "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz"
@@ -14609,6 +15148,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3"
+  integrity sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==
+  dependencies:
+    character-entities-html4 "^2.0.0"
+    character-entities-legacy "^3.0.0"
+
 stringify-object@^3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
@@ -14689,6 +15236,13 @@ style-loader@^3.3.1, style-loader@^3.3.3:
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff"
   integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==
 
+style-to-object@^1.0.0:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.8.tgz#67a29bca47eaa587db18118d68f9d95955e81292"
+  integrity sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==
+  dependencies:
+    inline-style-parser "0.2.4"
+
 stylehacks@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9"
@@ -15157,6 +15711,16 @@ tree-kill@^1.2.2:
   resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
+trim-lines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
+  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
+
+trough@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
+  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
+
 tryer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"
@@ -15459,6 +16023,11 @@ typescript@^5.5.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
   integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
 
+typescript@^5.7.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e"
+  integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==
+
 ua-parser-js@^1.0.36:
   version "1.0.36"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.36.tgz#a9ab6b9bd3a8efb90bb0816674b412717b7c428c"
@@ -15554,6 +16123,19 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"
   integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
+unified@^11.0.0:
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-11.0.5.tgz#f66677610a5c0a9ee90cab2b8d4d66037026d9e1"
+  integrity sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    bail "^2.0.0"
+    devlop "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^4.0.0"
+    trough "^2.0.0"
+    vfile "^6.0.0"
+
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz"
@@ -15561,6 +16143,44 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
+unist-util-is@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
+  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-position@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-5.0.0.tgz#678f20ab5ca1207a97d7ea8a388373c9cf896be4"
+  integrity sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-stringify-position@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
+  integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-visit-parents@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
+  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    unist-util-is "^6.0.0"
+
+unist-util-visit@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6"
+  integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    unist-util-is "^6.0.0"
+    unist-util-visit-parents "^6.0.0"
+
 universal-github-app-jwt@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/universal-github-app-jwt/-/universal-github-app-jwt-1.1.1.tgz#d57cee49020662a95ca750a057e758a1a7190e6e"
@@ -15757,6 +16377,22 @@ version-guard@^1.1.1:
   resolved "https://registry.yarnpkg.com/version-guard/-/version-guard-1.1.1.tgz#7a6e87a1babff1b43d6a7b0fd239731e278262fa"
   integrity sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==
 
+vfile-message@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"
+  integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    unist-util-stringify-position "^4.0.0"
+
+vfile@^6.0.0:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-6.0.3.tgz#3652ab1c496531852bf55a6bac57af981ebc38ab"
+  integrity sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    vfile-message "^4.0.0"
+
 vscode-jsonrpc@^5.0.0, vscode-jsonrpc@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
@@ -16555,3 +17191,8 @@ zen-observable@0.8.15:
   version "0.8.15"
   resolved "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
+
+zwitch@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
+  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==

From b2ee55edb9188b996ab51f77cfe3b4339c0d3c2d Mon Sep 17 00:00:00 2001
From: Gero Posmyk-Leinemann <gero@gitpod.io>
Date: Fri, 14 Feb 2025 11:59:45 +0000
Subject: [PATCH 2/6] [server, db] Cleanup UpdateOrgSettings API handling

Tool: gitpod/catfood.gitpod.cloud
---
 components/gitpod-db/package.json             |   1 +
 components/gitpod-db/src/team-db.ts           |   9 +-
 .../gitpod-db/src/typeorm/team-db-impl.ts     |  33 ++--
 .../src/teams-projects-protocol.ts            |  13 +-
 .../src/public-api-converter.ts               | 119 ++++++++++--
 .../src/api/organization-service-api.ts       | 108 +----------
 .../server/src/orgs/organization-service.ts   | 171 +++++++++++-------
 .../src/projects/projects-service.spec.db.ts  |   6 +-
 .../server/src/projects/projects-service.ts   |  14 +-
 yarn.lock                                     |   5 +
 10 files changed, 262 insertions(+), 217 deletions(-)

diff --git a/components/gitpod-db/package.json b/components/gitpod-db/package.json
index ffe5408ced1729..c2ff9cf2d8d9c7 100644
--- a/components/gitpod-db/package.json
+++ b/components/gitpod-db/package.json
@@ -43,6 +43,7 @@
     "prom-client": "^14.2.0",
     "reflect-metadata": "^0.1.13",
     "slugify": "^1.6.5",
+    "ts-deepmerge": "^7.0.2",
     "the-big-username-blacklist": "^1.5.2",
     "typeorm": "0.2.38"
   },
diff --git a/components/gitpod-db/src/team-db.ts b/components/gitpod-db/src/team-db.ts
index ae538a8dd0ebe7..5471d16a955422 100644
--- a/components/gitpod-db/src/team-db.ts
+++ b/components/gitpod-db/src/team-db.ts
@@ -42,7 +42,14 @@ export interface TeamDB extends TransactionalDB<TeamDB> {
     deleteTeam(teamId: string): Promise<void>;
 
     findOrgSettings(teamId: string): Promise<OrganizationSettings | undefined>;
-    setOrgSettings(teamId: string, settings: Partial<OrganizationSettings>): Promise<OrganizationSettings>;
+    setOrgSettings(
+        teamId: string,
+        settings: Partial<OrganizationSettings>,
+        merge: (
+            currentSettings: OrganizationSettings,
+            partialUpdate: Partial<OrganizationSettings>,
+        ) => OrganizationSettings,
+    ): Promise<OrganizationSettings>;
 
     hasActiveSSO(organizationId: string): Promise<boolean>;
 
diff --git a/components/gitpod-db/src/typeorm/team-db-impl.ts b/components/gitpod-db/src/typeorm/team-db-impl.ts
index 2ba33eefaaa7fe..2b5e5c840af589 100644
--- a/components/gitpod-db/src/typeorm/team-db-impl.ts
+++ b/components/gitpod-db/src/typeorm/team-db-impl.ts
@@ -394,18 +394,27 @@ export class TeamDBImpl extends TransactionalDBImpl<TeamDB> implements TeamDB {
         });
     }
 
-    public async setOrgSettings(orgId: string, settings: Partial<OrganizationSettings>): Promise<OrganizationSettings> {
-        const repo = await this.getOrgSettingsRepo();
-        const team = await repo.findOne({ where: { orgId, deleted: false } });
-        if (!team) {
-            return await repo.save({
-                ...settings,
-                orgId,
-            });
-        }
-        return await repo.save({
-            ...team,
-            ...settings,
+    public async setOrgSettings(
+        orgId: string,
+        partialUpdate: Partial<OrganizationSettings>,
+        merge: (
+            currentSettings: OrganizationSettings,
+            partialUpdate: Partial<OrganizationSettings>,
+        ) => OrganizationSettings,
+    ): Promise<OrganizationSettings> {
+        return this.transaction(async (db) => {
+            const teamDb = db as TeamDBImpl;
+            const repo = await teamDb.getOrgSettingsRepo();
+            const currentSettings = await repo.findOne({ where: { orgId, deleted: false } });
+            if (!currentSettings) {
+                return await repo.save({
+                    ...partialUpdate,
+                    orgId,
+                });
+            }
+
+            const settings = merge(currentSettings, partialUpdate);
+            return await repo.save(settings);
         });
     }
 
diff --git a/components/gitpod-protocol/src/teams-projects-protocol.ts b/components/gitpod-protocol/src/teams-projects-protocol.ts
index ed0c73f7f05c3d..228e025d1f5f21 100644
--- a/components/gitpod-protocol/src/teams-projects-protocol.ts
+++ b/components/gitpod-protocol/src/teams-projects-protocol.ts
@@ -285,11 +285,14 @@ export interface OnboardingSettings {
     /**
      * the welcome message for new members of the organization
      */
-    welcomeMessage?: {
-        featuredMemberId?: string;
-        message?: string;
-        footer?: string;
-    };
+    welcomeMessage?: WelcomeMessage;
+}
+
+export interface WelcomeMessage {
+    enabled?: boolean;
+    featuredMemberId?: string;
+    featuredMemberResolvedAvatarUrl?: string;
+    message?: string;
 }
 
 export type TeamMemberInfo = OrgMemberInfo;
diff --git a/components/public-api/typescript-common/src/public-api-converter.ts b/components/public-api/typescript-common/src/public-api-converter.ts
index 1ab4fd5f08774f..fb90f8265f8850 100644
--- a/components/public-api/typescript-common/src/public-api-converter.ts
+++ b/components/public-api/typescript-common/src/public-api-converter.ts
@@ -56,6 +56,10 @@ import {
     Organization as ProtocolOrganization,
     OrgMemberPermission,
     OrgMemberRole,
+    RoleRestrictions,
+    TimeoutSettings as TimeoutSettingsProtocol,
+    OnboardingSettings as OnboardingSettingsProtocol,
+    WelcomeMessage as WelcomeMessageProtocol,
 } from "@gitpod/gitpod-protocol/lib/teams-projects-protocol";
 import type { DeepPartial } from "@gitpod/gitpod-protocol/lib/util/deep-partial";
 import { parseGoDurationToMs } from "@gitpod/gitpod-protocol/lib/util/timeutil";
@@ -113,11 +117,15 @@ import {
     OnboardingState,
 } from "@gitpod/public-api/lib/gitpod/v1/installation_pb";
 import {
+    OnboardingSettings,
+    OnboardingSettings_WelcomeMessage,
     Organization,
     OrganizationMember,
     OrganizationPermission,
     OrganizationRole,
     OrganizationSettings,
+    RoleRestrictionEntry,
+    TimeoutSettings,
 } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import {
     Prebuild,
@@ -1040,6 +1048,61 @@ export class PublicAPIConverter {
         }
     }
 
+    fromOrgMemberRoleString(role: string): OrgMemberRole {
+        switch (role) {
+            case "owner":
+            case "member":
+            case "collaborator":
+                return role;
+            default:
+                throw new Error("invalid org member role");
+        }
+    }
+
+    fromTimeoutSettings(timeoutSettings: TimeoutSettings): TimeoutSettingsProtocol {
+        const result: TimeoutSettingsProtocol = {
+            denyUserTimeouts: timeoutSettings.denyUserTimeouts,
+        };
+        if (timeoutSettings.inactivity) {
+            result.inactivity = this.toDurationString(timeoutSettings.inactivity);
+        }
+        return result;
+    }
+
+    fromRoleRestrictions(roleRestrictions: RoleRestrictionEntry[]): RoleRestrictions {
+        const result: RoleRestrictions = {};
+        for (const roleRestriction of roleRestrictions) {
+            const role = this.fromOrgMemberRole(roleRestriction.role);
+            const permissions = roleRestriction.permissions.map((p) => this.fromOrganizationPermission(p));
+            result[role] = permissions;
+        }
+        return result;
+    }
+
+    fromOnboardingSettings(onboardingSettings: OnboardingSettings): OnboardingSettingsProtocol {
+        const result: OnboardingSettingsProtocol = {
+            internalLink: onboardingSettings.internalLink,
+        };
+
+        if (onboardingSettings.welcomeMessage) {
+            result.welcomeMessage = this.fromWelcomeMessage(onboardingSettings.welcomeMessage);
+        }
+
+        if (onboardingSettings.updateRecommendedRepositories) {
+            result.recommendedRepositories = onboardingSettings.recommendedRepositories;
+        }
+
+        return result;
+    }
+
+    fromWelcomeMessage(welcomeMessage: OnboardingSettings_WelcomeMessage): WelcomeMessageProtocol {
+        return {
+            enabled: welcomeMessage.enabled,
+            message: welcomeMessage.message,
+            featuredMemberId: welcomeMessage.featuredMemberId,
+        };
+    }
+
     fromWorkspaceSettings(settings?: DeepPartial<WorkspaceSettings>) {
         const result: Partial<
             Pick<
@@ -1132,26 +1195,52 @@ export class PublicAPIConverter {
             pinnedEditorVersions: settings.pinnedEditorVersions || {},
             restrictedEditorNames: settings.restrictedEditorNames || [],
             defaultRole: settings.defaultRole || undefined,
-            timeoutSettings: {
-                inactivity: settings.timeoutSettings?.inactivity
-                    ? this.toDuration(settings.timeoutSettings?.inactivity)
-                    : undefined,
-                denyUserTimeouts: settings.timeoutSettings?.denyUserTimeouts,
-            },
-            roleRestrictions: Object.entries(settings.roleRestrictions ?? {}).map(([role, permissions]) => ({
-                role: this.toOrgMemberRole(role as OrgMemberRole),
-                permissions: permissions.map((permission) => this.toOrganizationPermission(permission)),
-            })),
+            timeoutSettings: settings.timeoutSettings ? this.toTimeoutSettings(settings.timeoutSettings) : undefined,
+            roleRestrictions: settings.roleRestrictions
+                ? this.toRoleRestrictions(settings.roleRestrictions)
+                : undefined,
             maxParallelRunningWorkspaces: settings.maxParallelRunningWorkspaces ?? 0,
-            onboardingSettings: {
-                internalLink: settings?.onboardingSettings?.internalLink ?? undefined,
-                welcomeMessage: settings?.onboardingSettings?.welcomeMessage ?? undefined,
-                recommendedRepositories: settings?.onboardingSettings?.recommendedRepositories ?? [],
-            },
+            onboardingSettings: settings?.onboardingSettings
+                ? this.toOnboardingSettings(settings.onboardingSettings)
+                : undefined,
             annotateGitCommits: settings.annotateGitCommits ?? false,
         });
     }
 
+    toTimeoutSettings(settings: TimeoutSettingsProtocol): TimeoutSettings {
+        return new TimeoutSettings({
+            inactivity: settings.inactivity ? this.toDuration(settings.inactivity) : undefined,
+            denyUserTimeouts: settings.denyUserTimeouts,
+        });
+    }
+
+    toRoleRestrictions(roleRestrictions: RoleRestrictions): RoleRestrictionEntry[] {
+        return Object.entries(roleRestrictions ?? {}).map(
+            ([role, permissions]) =>
+                new RoleRestrictionEntry({
+                    role: this.toOrgMemberRole(role as OrgMemberRole),
+                    permissions: permissions.map((permission) => this.toOrganizationPermission(permission)),
+                }),
+        );
+    }
+
+    toOnboardingSettings(settings: OnboardingSettingsProtocol): OnboardingSettings {
+        return new OnboardingSettings({
+            internalLink: settings.internalLink,
+            welcomeMessage: settings.welcomeMessage ? this.toWelcomeMessage(settings.welcomeMessage) : undefined,
+            recommendedRepositories: settings.recommendedRepositories,
+        });
+    }
+
+    toWelcomeMessage(settings: WelcomeMessageProtocol): OnboardingSettings_WelcomeMessage {
+        return new OnboardingSettings_WelcomeMessage({
+            enabled: settings.enabled,
+            message: settings.message,
+            featuredMemberId: settings.featuredMemberId,
+            featuredMemberResolvedAvatarUrl: settings.featuredMemberResolvedAvatarUrl,
+        });
+    }
+
     toConfiguration(project: Project): Configuration {
         const result = new Configuration();
         result.id = project.id;
diff --git a/components/server/src/api/organization-service-api.ts b/components/server/src/api/organization-service-api.ts
index 766f6a9c00bcdf..8278213d6c96cf 100644
--- a/components/server/src/api/organization-service-api.ts
+++ b/components/server/src/api/organization-service-api.ts
@@ -46,22 +46,16 @@ import { validate as uuidValidate } from "uuid";
 import { ctxUserId } from "../util/request-context";
 import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { EntitlementService } from "../billing/entitlement-service";
-import { Config } from "../config";
-import { ProjectsService } from "../projects/projects-service";
 
 @injectable()
 export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationServiceInterface> {
     constructor(
-        @inject(Config)
-        private readonly config: Config,
         @inject(OrganizationService)
         private readonly orgService: OrganizationService,
         @inject(PublicAPIConverter)
         private readonly apiConverter: PublicAPIConverter,
         @inject(EntitlementService)
         private readonly entitlementService: EntitlementService,
-        @inject(ProjectsService)
-        private readonly projectService: ProjectsService,
     ) {}
 
     async listOrganizationWorkspaceClasses(
@@ -188,7 +182,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "organizationId is required");
         }
 
-        const members = await this.orgService.listMembers(ctxUserId(), req.organizationId, true);
+        const members = await this.orgService.listMembers(ctxUserId(), req.organizationId);
         //TODO pagination
         const response = new ListOrganizationMembersResponse();
         response.members = members.map((member) => this.apiConverter.toOrganizationMember(member));
@@ -218,7 +212,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             this.apiConverter.fromOrgMemberRole(req.role),
         );
         const member = await this.orgService
-            .listMembers(ctxUserId(), req.organizationId, true)
+            .listMembers(ctxUserId(), req.organizationId)
             .then((members) => members.find((member) => member.userId === req.userId));
         return new UpdateOrganizationMemberResponse({
             member: member && this.apiConverter.toOrganizationMember(member),
@@ -252,19 +246,6 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
         const response = new GetOrganizationSettingsResponse();
         response.settings = this.apiConverter.toOrganizationSettings(settings);
 
-        // resolve the avatar URL for the featured member in the welcome message
-        const onboardingWelcomeMessageFeaturedMemberId =
-            response.settings.onboardingSettings?.welcomeMessage?.featuredMemberId;
-        if (onboardingWelcomeMessageFeaturedMemberId) {
-            const member = await this.orgService
-                .getOrganizationMember(ctxUserId(), req.organizationId, onboardingWelcomeMessageFeaturedMemberId, true)
-                .catch(() => undefined);
-            if (member?.user.avatarUrl && response?.settings?.onboardingSettings?.welcomeMessage) {
-                response.settings.onboardingSettings.welcomeMessage.featuredMemberResolvedAvatarUrl =
-                    member.user.avatarUrl;
-            }
-        }
-
         return response;
     }
 
@@ -354,30 +335,8 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             update.maxParallelRunningWorkspaces = req.maxParallelRunningWorkspaces;
         }
 
-        if (req.onboardingSettings && Object.keys(req.onboardingSettings).length > 0) {
-            update.onboardingSettings = {};
-
-            if (!this.config.isDedicatedInstallation) {
-                throw new ApplicationError(
-                    ErrorCodes.BAD_REQUEST,
-                    "onboardingSettings can only be set on enterprise installations",
-                );
-            }
-
-            if (req.onboardingSettings.welcomeMessage?.featuredMemberResolvedAvatarUrl) {
-                throw new ApplicationError(
-                    ErrorCodes.BAD_REQUEST,
-                    "featuredMemberResolvedAvatarUrl is not allowed to be set",
-                );
-            }
-
-            if (req.onboardingSettings.internalLink) {
-                if (req.onboardingSettings.internalLink.length > 255) {
-                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "internalLink must be <= 255 characters long");
-                }
-
-                update.onboardingSettings.internalLink = req.onboardingSettings.internalLink;
-            }
+        if (req.onboardingSettings) {
+            update.onboardingSettings = this.apiConverter.fromOnboardingSettings(req.onboardingSettings);
 
             if (
                 !req.onboardingSettings.updateRecommendedRepositories &&
@@ -388,65 +347,8 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
                     "recommendedRepositories can only be set when updateRecommendedRepositories is true",
                 );
             }
-
-            if (
-                req.onboardingSettings.updateRecommendedRepositories &&
-                req.onboardingSettings.recommendedRepositories
-            ) {
-                if (req.onboardingSettings.recommendedRepositories.length > 3) {
-                    throw new ApplicationError(
-                        ErrorCodes.BAD_REQUEST,
-                        "there can't be more than 3 recommendedRepositories",
-                    );
-                }
-                for (const configurationId of req.onboardingSettings.recommendedRepositories) {
-                    if (!uuidValidate(configurationId)) {
-                        throw new ApplicationError(ErrorCodes.BAD_REQUEST, "recommendedRepositories must be UUIDs");
-                    }
-
-                    const project = await this.projectService.getProject(ctxUserId(), configurationId);
-                    if (!project) {
-                        throw new ApplicationError(ErrorCodes.BAD_REQUEST, `repository ${configurationId} not found`);
-                    }
-                }
-
-                update.onboardingSettings.recommendedRepositories = req.onboardingSettings.recommendedRepositories;
-            }
-
-            if (
-                req.onboardingSettings.welcomeMessage &&
-                Object.keys(req.onboardingSettings.welcomeMessage).length > 0
-            ) {
-                if (req.onboardingSettings.welcomeMessage.featuredMemberId) {
-                    const member = await this.orgService
-                        .getOrganizationMember(
-                            ctxUserId(),
-                            req.organizationId,
-                            req.onboardingSettings.welcomeMessage.featuredMemberId,
-                            true,
-                        )
-                        .catch(() => undefined);
-                    if (!member) {
-                        throw new ApplicationError(ErrorCodes.BAD_REQUEST, "featuredMemberId not found");
-                    }
-                }
-
-                if (
-                    req.onboardingSettings.welcomeMessage.enabled &&
-                    req.onboardingSettings.welcomeMessage.message?.length === 0
-                ) {
-                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "welcomeMessage must not be empty when enabled");
-                }
-
-                update.onboardingSettings.welcomeMessage = req.onboardingSettings.welcomeMessage;
-            }
-
-            const existingOnboardingSettings = await this.orgService.getSettings(ctxUserId(), req.organizationId);
-            update.onboardingSettings = {
-                ...existingOnboardingSettings.onboardingSettings,
-                ...update.onboardingSettings,
-            };
         }
+
         if (req.annotateGitCommits !== undefined) {
             update.annotateGitCommits = req.annotateGitCommits;
         }
diff --git a/components/server/src/orgs/organization-service.ts b/components/server/src/orgs/organization-service.ts
index 67c13d25bace85..9a2ab85a9678e3 100644
--- a/components/server/src/orgs/organization-service.ts
+++ b/components/server/src/orgs/organization-service.ts
@@ -36,7 +36,7 @@ import { UsageService } from "./usage-service";
 import { CostCenter_BillingStrategy } from "@gitpod/gitpod-protocol/lib/usage";
 import { CreateUserParams, UserAuthentication } from "../user/user-authentication";
 import isURL from "validator/lib/isURL";
-import { DBTeamMembership } from "@gitpod/gitpod-db/lib/typeorm/entity/db-team-membership";
+import { merge } from "ts-deepmerge";
 
 @injectable()
 export class OrganizationService {
@@ -119,32 +119,6 @@ export class OrganizationService {
         return result;
     }
 
-    async getOrganizationMember(
-        userId: string,
-        orgId: string,
-        memberId: string,
-        skipPermissionCheck?: boolean,
-    ): Promise<DBTeamMembership & { user: User }> {
-        if (!skipPermissionCheck) {
-            await this.auth.checkPermissionOnOrganization(userId, "read_members", orgId);
-        }
-
-        const membership = await this.teamDB.findTeamMembership(memberId, orgId);
-        if (!membership) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, `Organization member ${memberId} not found`);
-        }
-
-        const user = await this.userDB.findUserById(memberId);
-        if (!user) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, `User ${memberId} not found`);
-        }
-
-        return {
-            ...membership,
-            user,
-        };
-    }
-
     async listOrganizationsByMember(userId: string, memberId: string): Promise<Organization[]> {
         await this.auth.checkPermissionOnUser(userId, "read_info", memberId);
         const orgs = await this.teamDB.findTeamsByUser(memberId);
@@ -262,38 +236,19 @@ export class OrganizationService {
         }
     }
 
-    /**
-     * List members of an organization, excluding all deleted users and optionally the built-in installation admin user.
-     */
-    public async listMembers(
-        userId: string,
-        orgId: string,
-        excludeInstallationAdmin?: boolean,
-    ): Promise<OrgMemberInfo[]> {
+    public async listMembers(userId: string, orgId: string): Promise<OrgMemberInfo[]> {
         await this.auth.checkPermissionOnOrganization(userId, "read_members", orgId);
         const members = await this.teamDB.findMembersByTeam(orgId);
 
-        const filteredMembers = await Promise.all(
-            members.map(async (member) => {
-                // TODO(at) remove this workaround once email addresses are persisted under `User.emails`.
-                // For now we're avoiding adding `getPrimaryEmail` as dependency to `gitpod-db` module.
-                const user = await this.userDB.findUserById(member.userId);
-                if (user) {
-                    if (user.markedDeleted) {
-                        return null;
-                    }
-                    if (excludeInstallationAdmin && user.id === BUILTIN_INSTLLATION_ADMIN_USER_ID) {
-                        return null;
-                    }
-
-                    member.primaryEmail = getPrimaryEmail(user);
-                }
-
-                return member;
-            }),
-        );
-
-        return filteredMembers.filter((m) => !!m);
+        // TODO(at) remove this workaround once email addresses are persisted under `User.emails`.
+        // For now we're avoiding adding `getPrimaryEmail` as dependency to `gitpod-db` module.
+        for (const member of members) {
+            const user = await this.userDB.findUserById(member.userId);
+            if (user) {
+                member.primaryEmail = getPrimaryEmail(user);
+            }
+        }
+        return members;
     }
 
     public async getOrCreateInvite(userId: string, orgId: string): Promise<TeamMembershipInvite> {
@@ -596,18 +551,88 @@ export class OrganizationService {
             }
         }
 
-        if (settings.onboardingSettings?.internalLink) {
-            if (
-                !isURL(settings.onboardingSettings.internalLink ?? "", {
-                    require_protocol: true,
-                    host_blacklist: ["localhost", "127.0.0.1", "::1"],
-                })
-            ) {
-                throw new ApplicationError(ErrorCodes.BAD_REQUEST, "Invalid internal link");
+        if (settings.onboardingSettings) {
+            if (settings.onboardingSettings.internalLink) {
+                if (settings.onboardingSettings.internalLink.length > 255) {
+                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "internalLink must be <= 255 characters long");
+                }
+
+                if (
+                    !isURL(settings.onboardingSettings.internalLink, {
+                        require_protocol: true,
+                        host_blacklist: ["localhost", "127.0.0.1", "::1"],
+                    })
+                ) {
+                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "Invalid internal link");
+                }
+            }
+
+            if (settings.onboardingSettings.recommendedRepositories) {
+                if (settings.onboardingSettings.recommendedRepositories.length > 3) {
+                    throw new ApplicationError(
+                        ErrorCodes.BAD_REQUEST,
+                        "there can't be more than 3 recommendedRepositories",
+                    );
+                }
+                for (const configurationId of settings.onboardingSettings.recommendedRepositories) {
+                    const project = await this.projectsService.getProject(userId, configurationId);
+                    if (!project) {
+                        throw new ApplicationError(ErrorCodes.BAD_REQUEST, `repository ${configurationId} not found`);
+                    }
+                }
+            }
+
+            if (settings.onboardingSettings.welcomeMessage) {
+                const welcomeMessage = settings.onboardingSettings.welcomeMessage;
+
+                if (welcomeMessage.featuredMemberResolvedAvatarUrl) {
+                    throw new ApplicationError(
+                        ErrorCodes.BAD_REQUEST,
+                        "featuredMemberResolvedAvatarUrl is not allowed to be set",
+                    );
+                }
+
+                if (welcomeMessage.featuredMemberId) {
+                    const membership = await this.teamDB.findTeamMembership(welcomeMessage.featuredMemberId, orgId);
+                    if (!membership) {
+                        throw new ApplicationError(ErrorCodes.BAD_REQUEST, "featuredMemberId is invalid");
+                    }
+                    const user = await this.userDB.findUserById(membership.userId);
+                    if (!user) {
+                        throw new ApplicationError(
+                            ErrorCodes.NOT_FOUND,
+                            `user for featuredMemberId ${membership.userId} not found`,
+                        );
+                    }
+                    welcomeMessage.featuredMemberResolvedAvatarUrl = user.avatarUrl;
+                }
+
+                if (welcomeMessage.enabled && (!welcomeMessage.message || welcomeMessage.message.length === 0)) {
+                    throw new ApplicationError(ErrorCodes.BAD_REQUEST, "welcomeMessage must not be empty when enabled");
+                }
             }
         }
 
-        return this.toSettings(await this.teamDB.setOrgSettings(orgId, settings));
+        const mergeSettings = (
+            currentSettings: OrganizationSettings,
+            partialUpdate: Partial<OrganizationSettings>,
+        ): OrganizationSettings => {
+            // We want to deep-merge columns that are JSON shapes here.
+            // We ignore fields set to undefined, and don't merge arrays to match our API semantics
+            const settings = merge.withOptions(
+                { mergeArrays: false, allowUndefinedOverrides: false },
+                currentSettings,
+                partialUpdate,
+            );
+
+            // roleRestrictions is an exception: override if set
+            if (partialUpdate.roleRestrictions !== undefined) {
+                settings.roleRestrictions = partialUpdate.roleRestrictions;
+            }
+            return settings;
+        };
+
+        return this.toSettings(await this.teamDB.setOrgSettings(orgId, settings, mergeSettings));
     }
 
     private async toSettings(settings: OrganizationSettings = {}): Promise<OrganizationSettings> {
@@ -652,6 +677,22 @@ export class OrganizationService {
         return result;
     }
 
+    /**
+     * To be notified when a project is deleted, so that we can remove it from the list of recommended repositories
+     */
+    public async onProjectDeletion(userId: string, organizationId: string, projectId: string): Promise<void> {
+        const orgSettings = await this.getSettings(userId, organizationId);
+        const repoRecommendations = orgSettings.onboardingSettings?.recommendedRepositories;
+        if (repoRecommendations) {
+            const updatedRepoRecommendations = repoRecommendations.filter((id) => id !== projectId);
+            if (updatedRepoRecommendations.length !== repoRecommendations.length) {
+                await this.updateSettings(userId, organizationId, {
+                    onboardingSettings: { recommendedRepositories: updatedRepoRecommendations },
+                });
+            }
+        }
+    }
+
     public async listWorkspaceClasses(userId: string, orgId: string): Promise<SupportedWorkspaceClass[]> {
         const allClasses = await this.installationService.getInstallationWorkspaceClasses(userId);
         const settings = await this.getSettings(userId, orgId);
diff --git a/components/server/src/projects/projects-service.spec.db.ts b/components/server/src/projects/projects-service.spec.db.ts
index 1bbf58d5e1420a..9c7f3a0602cd31 100644
--- a/components/server/src/projects/projects-service.spec.db.ts
+++ b/components/server/src/projects/projects-service.spec.db.ts
@@ -131,13 +131,13 @@ describe("ProjectsService", async () => {
         const organizationService = container.get(OrganizationService);
         const recommendations = await organizationService.updateSettings(owner.id, org.id, {
             onboardingSettings: {
-                recommendedRepositories: ["a", project.id, "b"],
+                recommendedRepositories: [project.id],
             },
         });
-        expect(recommendations.onboardingSettings?.recommendedRepositories).to.deep.equal(["a", project.id, "b"]);
+        expect(recommendations.onboardingSettings?.recommendedRepositories).to.deep.equal([project.id]);
         await withTestCtx(owner, () => ps.deleteProject(owner.id, project.id));
         const recommendationsAfterDelete = await organizationService.getSettings(owner.id, org.id);
-        expect(recommendationsAfterDelete.onboardingSettings?.recommendedRepositories).to.deep.equal(["a", "b"]);
+        expect(recommendationsAfterDelete.onboardingSettings?.recommendedRepositories).to.deep.equal([]);
     });
 
     it("should updateProject", async () => {
diff --git a/components/server/src/projects/projects-service.ts b/components/server/src/projects/projects-service.ts
index 77b4095fc06cbe..ac5f643a4e8f5f 100644
--- a/components/server/src/projects/projects-service.ts
+++ b/components/server/src/projects/projects-service.ts
@@ -40,7 +40,6 @@ import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { ContextParser } from "../workspace/context-parser-service";
 import { UnauthorizedError } from "../errors";
 import { LazyOrganizationService } from "../billing/entitlement-service-ubp";
-import { SubjectId } from "../auth/subject-id";
 
 // to resolve circular dependency issues
 export const LazyPrebuildManager = Symbol("LazyPrebuildManager");
@@ -354,18 +353,7 @@ export class ProjectsService {
                     await db.deleteProjectEnvironmentVariable(envVar.id);
                 }
 
-                await runWithSubjectId(SubjectId.fromUserId(userId), async () => {
-                    const orgSettings = await organizationService.getSettings(userId, orgId!);
-                    const repoRecommendations = orgSettings.onboardingSettings?.recommendedRepositories;
-                    if (repoRecommendations) {
-                        const updatedRepoRecommendations = repoRecommendations.filter((id) => id !== projectId);
-                        if (updatedRepoRecommendations.length !== repoRecommendations.length) {
-                            await organizationService.updateSettings(userId, orgId!, {
-                                onboardingSettings: { recommendedRepositories: updatedRepoRecommendations },
-                            });
-                        }
-                    }
-                });
+                await organizationService.onProjectDeletion(userId, orgId, projectId);
 
                 await this.auth.removeProjectFromOrg(userId, orgId, projectId);
             });
diff --git a/yarn.lock b/yarn.lock
index 9c0979ec846e10..f84ad39fc60d45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15726,6 +15726,11 @@ tryer@^1.0.1:
   resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
+ts-deepmerge@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/ts-deepmerge/-/ts-deepmerge-7.0.2.tgz#6333adcde83e4c42366e9a9a7f955c74ee913547"
+  integrity sha512-akcpDTPuez4xzULo5NwuoKwYRtjQJ9eoNfBACiBMaXwNAx7B1PKfe5wqUFJuW5uKzQ68YjDFwPaWHDG1KnFGsA==
+
 ts-error@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/ts-error/-/ts-error-1.0.6.tgz#277496f2a28de6c184cfce8dfd5cdd03a4e6b0fc"

From fac9721b398cead9e6aee0b5847edee4fb12abad Mon Sep 17 00:00:00 2001
From: Gero Posmyk-Leinemann <gero@gitpod.io>
Date: Fri, 14 Feb 2025 12:00:19 +0000
Subject: [PATCH 3/6] [dashboard] Render WelcomeMessage based on a)
 user.createdAt and b) localStorage

Tool: gitpod/catfood.gitpod.cloud
---
 .../onboarding/OrganizationJoinModal.tsx      | 41 ++++++++++++-------
 .../dashboard/src/workspaces/Workspaces.tsx   |  6 ++-
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx b/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx
index db7b2a6ffcabbe..31aae9f536895c 100644
--- a/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx
+++ b/components/dashboard/src/teams/onboarding/OrganizationJoinModal.tsx
@@ -4,25 +4,38 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { OrganizationSettings } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { Button } from "@podkit/buttons/Button";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Modal, ModalBody, ModalFooter, ModalHeader } from "../../components/Modal";
 import { storageAvailable } from "../../utils";
 import { WelcomeMessagePreview } from "./WelcomeMessagePreview";
+import { User } from "@gitpod/public-api/lib/gitpod/v1/user_pb";
 
 type Props = {
-    orgSettings: OrganizationSettings;
+    user: User;
+    welcomeMessage: OnboardingSettings_WelcomeMessage;
 };
-export const OrganizationJoinModal = ({ orgSettings }: Props) => {
+export const OrganizationJoinModal = ({ welcomeMessage, user }: Props) => {
     const initialOrgOnboardingPending = useMemo(() => {
-        if (storageAvailable("localStorage")) {
-            return localStorage.getItem("newUserOnboardingPending") === "true";
+        if (!storageAvailable("localStorage")) {
+            return false;
         }
-    }, []);
-    const dismissOrgOnboardingPending = useCallback(() => {
+
+        const alreadyOnboarded = localStorage.getItem("newUserOnboardingDone") === "true";
+        if (alreadyOnboarded) {
+            return false;
+        }
+
+        // We want to show this message to users who just signed up, so we select the "new-ish" users here
+        const oneWeekSeconds = 7 * 24 * 60 * 60;
+        const userCreatedWithinLast7Days =
+            user.createdAt && user.createdAt.seconds >= Date.now() / 1000 - oneWeekSeconds;
+        return userCreatedWithinLast7Days;
+    }, [user.createdAt]);
+    const dismissOrgOnboarding = useCallback(() => {
         if (storageAvailable("localStorage")) {
-            localStorage.removeItem("newUserOnboardingPending");
+            localStorage.setItem("newUserOnboardingDone", "true");
         }
 
         setOrgOnboardingPending(false);
@@ -31,19 +44,19 @@ export const OrganizationJoinModal = ({ orgSettings }: Props) => {
 
     // if the org-wide welcome message is not enabled, prevent showing it in the future
     useEffect(() => {
-        if (!orgSettings?.onboardingSettings?.welcomeMessage?.enabled) {
-            dismissOrgOnboardingPending();
+        if (!welcomeMessage.enabled) {
+            dismissOrgOnboarding();
         }
-    }, [orgSettings?.onboardingSettings?.welcomeMessage?.enabled, dismissOrgOnboardingPending]);
+    }, [welcomeMessage.enabled, dismissOrgOnboarding]);
 
-    if (!orgSettings?.onboardingSettings?.welcomeMessage?.enabled) {
+    if (!welcomeMessage.enabled || !orgOnboardingPending) {
         return null;
     }
 
     return (
         <Modal
             visible={orgOnboardingPending}
-            onClose={dismissOrgOnboardingPending}
+            onClose={dismissOrgOnboarding}
             containerClassName="min-[576px]:max-w-[650px]"
         >
             <ModalHeader>Welcome to Gitpod</ModalHeader>
@@ -51,7 +64,7 @@ export const OrganizationJoinModal = ({ orgSettings }: Props) => {
                 <WelcomeMessagePreview hideHeader />
             </ModalBody>
             <ModalFooter>
-                <Button onClick={dismissOrgOnboardingPending}>Get Started</Button>
+                <Button onClick={dismissOrgOnboarding}>Get Started</Button>
             </ModalFooter>
         </Modal>
     );
diff --git a/components/dashboard/src/workspaces/Workspaces.tsx b/components/dashboard/src/workspaces/Workspaces.tsx
index e53665c74ea841..55eb39b7e5d202 100644
--- a/components/dashboard/src/workspaces/Workspaces.tsx
+++ b/components/dashboard/src/workspaces/Workspaces.tsx
@@ -183,6 +183,8 @@ const WorkspacesPage: FunctionComponent = () => {
         setVideoModalVisible(false);
     }, []);
 
+    const welcomeMessage = orgSettings?.onboardingSettings?.welcomeMessage;
+
     return (
         <>
             <Header
@@ -479,7 +481,9 @@ const WorkspacesPage: FunctionComponent = () => {
                     <EmptyWorkspacesContent />
                 ))}
 
-            {orgSettings && <OrganizationJoinModal orgSettings={orgSettings} />}
+            {isEnterpriseOnboardingEnabled && isDedicatedInstallation && welcomeMessage && user && (
+                <OrganizationJoinModal welcomeMessage={welcomeMessage} user={user} />
+            )}
         </>
     );
 };

From 951aa83fedec2cae68bf372c64fdb520fa0b0d53 Mon Sep 17 00:00:00 2001
From: Gero Posmyk-Leinemann <gero@gitpod.io>
Date: Fri, 14 Feb 2025 12:01:48 +0000
Subject: [PATCH 4/6] [api, server] Add missing
 update_allowed_workspace_classes field

Tool: gitpod/catfood.gitpod.cloud
---
 .../public-api/gitpod/v1/organization.proto   |  15 +-
 .../public-api/go/v1/organization.pb.go       | 569 +++++++--------
 .../publicapi/v1/OrganizationOuterClass.java  | 650 +++++++++++++-----
 .../src/gitpod/v1/organization_pb.ts          |  21 +-
 .../src/api/organization-service-api.ts       |  12 +-
 5 files changed, 803 insertions(+), 464 deletions(-)

diff --git a/components/public-api/gitpod/v1/organization.proto b/components/public-api/gitpod/v1/organization.proto
index c2aebf2ebdc178..fa0a96e8a815bd 100644
--- a/components/public-api/gitpod/v1/organization.proto
+++ b/components/public-api/gitpod/v1/organization.proto
@@ -194,20 +194,22 @@ message UpdateOrganizationSettingsRequest {
 
   // allowed_workspace_classes are the IDs of classes, which can be used by
   // workspaces in an organization. Pass an empty array to allow all workspace
-  // classes
+  // classes.
+  // Only updates if update_allowed_workspace_classes is true.
   repeated string allowed_workspace_classes = 5;
 
   // restricted_editor_names updates the list of restricted editor names that
   // are not allowed to be used by workspaces in an organization. If empty, all
-  // editors are allowed. Only updates if update_restricted_editor_names is
-  // true.
+  // editors are allowed.
+  // Only updates if update_restricted_editor_names is true.
   repeated string restricted_editor_names = 6;
 
   // Specifies whether restricted_workspace_classes should be updated
   optional bool update_restricted_editor_names = 7;
 
   // pinned_editor_versions updates the pinned version for the corresponding
-  // editor
+  // editor.
+  // Only updates if update_pinned_editor_versions is true.
   map<string, string> pinned_editor_versions = 8;
 
   // Specifies whether pinned_editor_versions should be updated
@@ -219,6 +221,7 @@ message UpdateOrganizationSettingsRequest {
   // timeout_settings are the settings for workspace timeouts
   optional TimeoutSettings timeout_settings = 11;
 
+  // Only updates if update_role_restrictions is true.
   repeated RoleRestrictionEntry role_restrictions = 12;
 
   // update_role_restrictions specifies whether role_restrictions should be
@@ -236,6 +239,10 @@ message UpdateOrganizationSettingsRequest {
   // annotate_git_commits specifies whether to annotate git commits created in
   // Gitpod workspaces with the gitpod host
   optional bool annotate_git_commits = 17;
+
+  // update_role_restrictions specifies whether role_restrictions should be
+  // updated
+  optional bool update_allowed_workspace_classes = 18;
 }
 
 message UpdateOrganizationSettingsResponse {
diff --git a/components/public-api/go/v1/organization.pb.go b/components/public-api/go/v1/organization.pb.go
index b5431bf1f65385..e385d82cb51efb 100644
--- a/components/public-api/go/v1/organization.pb.go
+++ b/components/public-api/go/v1/organization.pb.go
@@ -895,24 +895,27 @@ type UpdateOrganizationSettingsRequest struct {
 	DefaultWorkspaceImage *string `protobuf:"bytes,4,opt,name=default_workspace_image,json=defaultWorkspaceImage,proto3,oneof" json:"default_workspace_image,omitempty"`
 	// allowed_workspace_classes are the IDs of classes, which can be used by
 	// workspaces in an organization. Pass an empty array to allow all workspace
-	// classes
+	// classes.
+	// Only updates if update_allowed_workspace_classes is true.
 	AllowedWorkspaceClasses []string `protobuf:"bytes,5,rep,name=allowed_workspace_classes,json=allowedWorkspaceClasses,proto3" json:"allowed_workspace_classes,omitempty"`
 	// restricted_editor_names updates the list of restricted editor names that
 	// are not allowed to be used by workspaces in an organization. If empty, all
-	// editors are allowed. Only updates if update_restricted_editor_names is
-	// true.
+	// editors are allowed.
+	// Only updates if update_restricted_editor_names is true.
 	RestrictedEditorNames []string `protobuf:"bytes,6,rep,name=restricted_editor_names,json=restrictedEditorNames,proto3" json:"restricted_editor_names,omitempty"`
 	// Specifies whether restricted_workspace_classes should be updated
 	UpdateRestrictedEditorNames *bool `protobuf:"varint,7,opt,name=update_restricted_editor_names,json=updateRestrictedEditorNames,proto3,oneof" json:"update_restricted_editor_names,omitempty"`
 	// pinned_editor_versions updates the pinned version for the corresponding
-	// editor
+	// editor.
+	// Only updates if update_pinned_editor_versions is true.
 	PinnedEditorVersions map[string]string `protobuf:"bytes,8,rep,name=pinned_editor_versions,json=pinnedEditorVersions,proto3" json:"pinned_editor_versions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Specifies whether pinned_editor_versions should be updated
 	UpdatePinnedEditorVersions *bool `protobuf:"varint,9,opt,name=update_pinned_editor_versions,json=updatePinnedEditorVersions,proto3,oneof" json:"update_pinned_editor_versions,omitempty"`
 	// default_role is the default role for new members in the organization
 	DefaultRole *string `protobuf:"bytes,10,opt,name=default_role,json=defaultRole,proto3,oneof" json:"default_role,omitempty"`
 	// timeout_settings are the settings for workspace timeouts
-	TimeoutSettings  *TimeoutSettings        `protobuf:"bytes,11,opt,name=timeout_settings,json=timeoutSettings,proto3,oneof" json:"timeout_settings,omitempty"`
+	TimeoutSettings *TimeoutSettings `protobuf:"bytes,11,opt,name=timeout_settings,json=timeoutSettings,proto3,oneof" json:"timeout_settings,omitempty"`
+	// Only updates if update_role_restrictions is true.
 	RoleRestrictions []*RoleRestrictionEntry `protobuf:"bytes,12,rep,name=role_restrictions,json=roleRestrictions,proto3" json:"role_restrictions,omitempty"`
 	// update_role_restrictions specifies whether role_restrictions should be
 	// updated
@@ -926,6 +929,9 @@ type UpdateOrganizationSettingsRequest struct {
 	// annotate_git_commits specifies whether to annotate git commits created in
 	// Gitpod workspaces with the gitpod host
 	AnnotateGitCommits *bool `protobuf:"varint,17,opt,name=annotate_git_commits,json=annotateGitCommits,proto3,oneof" json:"annotate_git_commits,omitempty"`
+	// update_role_restrictions specifies whether role_restrictions should be
+	// updated
+	UpdateAllowedWorkspaceClasses *bool `protobuf:"varint,18,opt,name=update_allowed_workspace_classes,json=updateAllowedWorkspaceClasses,proto3,oneof" json:"update_allowed_workspace_classes,omitempty"`
 }
 
 func (x *UpdateOrganizationSettingsRequest) Reset() {
@@ -1065,6 +1071,13 @@ func (x *UpdateOrganizationSettingsRequest) GetAnnotateGitCommits() bool {
 	return false
 }
 
+func (x *UpdateOrganizationSettingsRequest) GetUpdateAllowedWorkspaceClasses() bool {
+	if x != nil && x.UpdateAllowedWorkspaceClasses != nil {
+		return *x.UpdateAllowedWorkspaceClasses
+	}
+	return false
+}
+
 type UpdateOrganizationSettingsResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2475,7 +2488,7 @@ var file_gitpod_v1_organization_proto_rawDesc = []byte{
 	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f,
 	0x69, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x64,
 	0x65, 0x6e, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x73, 0x22, 0x8a, 0x0b, 0x0a, 0x21, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
+	0x73, 0x22, 0xfd, 0x0b, 0x0a, 0x21, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
 	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e,
 	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
@@ -2541,287 +2554,295 @@ var file_gitpod_v1_organization_proto_rawDesc = []byte{
 	0x6e, 0x67, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
 	0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x11,
 	0x20, 0x01, 0x28, 0x08, 0x48, 0x09, 0x52, 0x12, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65,
-	0x47, 0x69, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x88, 0x01, 0x01, 0x1a, 0x47, 0x0a,
-	0x19, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x1d, 0x0a, 0x1b, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67,
-	0x65, 0x42, 0x21, 0x0a, 0x1f, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x73,
-	0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x73, 0x42, 0x20, 0x0a, 0x1e, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f,
-	0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x1b, 0x0a, 0x19,
-	0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73,
-	0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x6d, 0x61,
-	0x78, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69,
-	0x6e, 0x67, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x42, 0x16, 0x0a,
-	0x14, 0x5f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
-	0x74, 0x65, 0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x22, 0x61,
-	0x0a, 0x22, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x73, 0x22, 0x49, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5e, 0x0a, 0x1f,
-	0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22, 0x2f, 0x0a, 0x19,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x59, 0x0a,
-	0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x56, 0x0a, 0x17, 0x47,
+	0x47, 0x69, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x88, 0x01, 0x01, 0x12, 0x4c, 0x0a,
+	0x20, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f,
+	0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65,
+	0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x48, 0x0a, 0x52, 0x1d, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x88, 0x01, 0x01, 0x1a, 0x47, 0x0a, 0x19, 0x50,
+	0x69, 0x6e, 0x6e, 0x65, 0x64, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x42, 0x1d, 0x0a, 0x1b, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
+	0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x42,
+	0x21, 0x0a, 0x1f, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72,
+	0x69, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x73, 0x42, 0x20, 0x0a, 0x1e, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x69,
+	0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
+	0x74, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72,
+	0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x6d, 0x61, 0x78, 0x5f,
+	0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67,
+	0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x42, 0x16, 0x0a, 0x14, 0x5f,
+	0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69,
+	0x6e, 0x67, 0x73, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65,
+	0x5f, 0x67, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x42, 0x23, 0x0a, 0x21,
+	0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f,
+	0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x65,
+	0x73, 0x22, 0x61, 0x0a, 0x22, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69,
+	0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74,
+	0x69, 0x6e, 0x67, 0x73, 0x22, 0x49, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22,
+	0x5e, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x3b, 0x0a, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x08, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x22,
+	0x2f, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x22, 0x59, 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b,
+	0x0a, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x16, 0x47,
 	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67,
-	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0xda, 0x01, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
-	0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f,
-	0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e,
-	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x22,
-	0x3f, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x43, 0x4f, 0x50,
-	0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
-	0x10, 0x0a, 0x0c, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10,
-	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x41, 0x4c, 0x4c, 0x10, 0x02,
-	0x22, 0x99, 0x01, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d,
-	0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
-	0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d,
-	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3d, 0x0a,
-	0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61,
-	0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x44, 0x0a, 0x19,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x4b, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
+	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x56,
+	0x0a, 0x17, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x6f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xda, 0x01, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
+	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x3f, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x05, 0x73, 0x63, 0x6f,
+	0x70, 0x65, 0x22, 0x3f, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x53,
+	0x43, 0x4f, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
+	0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x42,
+	0x45, 0x52, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x41, 0x4c,
+	0x4c, 0x10, 0x02, 0x22, 0x99, 0x01, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x3d, 0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x3d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22,
+	0x44, 0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f,
+	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x4b, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64,
+	0x22, 0x48, 0x0a, 0x21, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e,
+	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x17, 0x4a, 0x6f,
+	0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e,
+	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x18, 0x4a, 0x6f,
+	0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22,
+	0x4d, 0x0a, 0x22, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
+	0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4a,
+	0x0a, 0x23, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e,
+	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x87, 0x01, 0x0a, 0x1e, 0x4c,
+	0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a,
+	0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74,
+	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x22, 0x99, 0x01, 0x0a, 0x1f, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62,
+	0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x73, 0x12, 0x3d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x22, 0xa2, 0x01, 0x0a, 0x1f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x48, 0x0a,
-	0x21, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x17, 0x4a, 0x6f, 0x69, 0x6e, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x18, 0x4a, 0x6f, 0x69, 0x6e, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a,
+	0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c,
+	0x65, 0x48, 0x00, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05,
+	0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x59, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x06, 0x6d, 0x65, 0x6d,
+	0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x22, 0x63, 0x0a, 0x1f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x22,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07,
+	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x94, 0x01, 0x0a, 0x10, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x21,
+	0x0a, 0x1d, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52,
+	0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+	0x00, 0x12, 0x1b, 0x0a, 0x17, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f,
+	0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x4f, 0x57, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1c,
+	0x0a, 0x18, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52,
+	0x4f, 0x4c, 0x45, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e,
+	0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c,
+	0x45, 0x5f, 0x43, 0x4f, 0x4c, 0x4c, 0x41, 0x42, 0x4f, 0x52, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x03,
+	0x2a, 0x74, 0x0a, 0x16, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x52,
+	0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49,
+	0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x31, 0x0a, 0x2d, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54,
+	0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53,
+	0x54, 0x41, 0x52, 0x54, 0x5f, 0x41, 0x52, 0x42, 0x49, 0x54, 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52,
+	0x45, 0x50, 0x4f, 0x53, 0x10, 0x01, 0x32, 0xbe, 0x0c, 0x0a, 0x13, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63,
+	0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74,
+	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x5a, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x63, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69,
+	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24,
+	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f,
+	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x47,
+	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
+	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x10, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70,
+	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e,
+	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x7e, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
 	0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x23, 0x52,
+	0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52,
 	0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
 	0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x87, 0x01, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12,
+	0x29, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74,
 	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62,
-	0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x49, 0x64, 0x12, 0x3c, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0x99, 0x01, 0x0a, 0x1f, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
-	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x3d,
-	0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50,
-	0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa2, 0x01,
-	0x0a, 0x1f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73,
-	0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
-	0x72, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x1b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x48, 0x00,
-	0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x72, 0x6f,
-	0x6c, 0x65, 0x22, 0x59, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
-	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x63, 0x0a,
-	0x1f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
+	0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74,
+	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65,
+	0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65,
-	0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72,
-	0x49, 0x64, 0x22, 0x22, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x94, 0x01, 0x0a, 0x10, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x4f,
-	0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b,
-	0x0a, 0x17, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52,
-	0x4f, 0x4c, 0x45, 0x5f, 0x4f, 0x57, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x4f,
-	0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45,
-	0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x4f, 0x52, 0x47,
-	0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x43,
-	0x4f, 0x4c, 0x4c, 0x41, 0x42, 0x4f, 0x52, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x03, 0x2a, 0x74, 0x0a,
-	0x16, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72,
-	0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x52, 0x47, 0x41, 0x4e,
-	0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49,
-	0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x31, 0x0a, 0x2d, 0x4f, 0x52, 0x47, 0x41, 0x4e, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e,
-	0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x52,
-	0x54, 0x5f, 0x41, 0x52, 0x42, 0x49, 0x54, 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x50, 0x4f,
-	0x53, 0x10, 0x01, 0x32, 0xbe, 0x0c, 0x0a, 0x13, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63, 0x0a, 0x12, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x5a, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x12,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x60, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x67, 0x69,
-	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61,
-	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x25, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
-	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x5d, 0x0a, 0x10, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
-	0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x69, 0x74,
-	0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x7e, 0x0a, 0x1b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73,
-	0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
-	0x76, 0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x2e, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x65,
-	0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x76,
-	0x69, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x72, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x67,
-	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67,
-	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f,
-	0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65,
-	0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70,
+	0x1a, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x75, 0x0a, 0x18, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69,
+	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72,
+	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64,
+	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67,
+	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x73, 0x12, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+	0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61,
+	0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x1a, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e,
-	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62,
-	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x18,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31,
-	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x29,
-	0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
+	0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
+	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x2c, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76,
-	0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x8d, 0x01, 0x0a, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8d, 0x01, 0x0a, 0x20, 0x4c, 0x69, 0x73, 0x74,
+	0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x32, 0x2e, 0x67,
+	0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67,
 	0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x12, 0x32, 0x2e, 0x67, 0x69, 0x74, 0x70,
-	0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43,
-	0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e,
-	0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x72,
-	0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x42, 0x51, 0x0a, 0x16, 0x69, 0x6f, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x5a, 0x37,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f,
-	0x64, 0x2d, 0x69, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2f, 0x63, 0x6f, 0x6d, 0x70,
-	0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2d, 0x61, 0x70,
-	0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x33, 0x2e, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x4f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72,
+	0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x51, 0x0a, 0x16, 0x69, 0x6f, 0x2e, 0x67, 0x69,
+	0x74, 0x70, 0x6f, 0x64, 0x2e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x31, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69,
+	0x74, 0x70, 0x6f, 0x64, 0x2d, 0x69, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x70, 0x6f, 0x64, 0x2f, 0x63,
+	0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
+	0x2d, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java b/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java
index 11bac324f3ab7e..3e290e7d288491 100644
--- a/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java
+++ b/components/public-api/java/src/main/java/io/gitpod/publicapi/v1/OrganizationOuterClass.java
@@ -12377,7 +12377,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12389,7 +12390,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12400,7 +12402,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12412,7 +12415,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12426,8 +12430,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -12439,8 +12443,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -12451,8 +12455,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -12464,8 +12468,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -12497,7 +12501,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -12506,7 +12511,8 @@ public interface UpdateOrganizationSettingsRequestOrBuilder extends
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -12522,7 +12528,8 @@ boolean containsPinnedEditorVersions(
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -12532,7 +12539,8 @@ boolean containsPinnedEditorVersions(
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -12545,7 +12553,8 @@ java.lang.String getPinnedEditorVersionsOrDefault(
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -12629,24 +12638,44 @@ java.lang.String getPinnedEditorVersionsOrThrow(
     io.gitpod.publicapi.v1.OrganizationOuterClass.TimeoutSettingsOrBuilder getTimeoutSettingsOrBuilder();
 
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry>
         getRoleRestrictionsList();
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry getRoleRestrictions(int index);
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     int getRoleRestrictionsCount();
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     java.util.List<? extends io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder>
         getRoleRestrictionsOrBuilderList();
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getRoleRestrictionsOrBuilder(
@@ -12743,6 +12772,27 @@ io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getR
      * @return The annotateGitCommits.
      */
     boolean getAnnotateGitCommits();
+
+    /**
+     * <pre>
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
+     * </pre>
+     *
+     * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+     * @return Whether the updateAllowedWorkspaceClasses field is set.
+     */
+    boolean hasUpdateAllowedWorkspaceClasses();
+    /**
+     * <pre>
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
+     * </pre>
+     *
+     * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+     * @return The updateAllowedWorkspaceClasses.
+     */
+    boolean getUpdateAllowedWorkspaceClasses();
   }
   /**
    * Protobuf type {@code gitpod.v1.UpdateOrganizationSettingsRequest}
@@ -12935,7 +12985,8 @@ public java.lang.String getDefaultWorkspaceImage() {
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12949,7 +13000,8 @@ public java.lang.String getDefaultWorkspaceImage() {
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12962,7 +13014,8 @@ public int getAllowedWorkspaceClassesCount() {
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12976,7 +13029,8 @@ public java.lang.String getAllowedWorkspaceClasses(int index) {
      * <pre>
      * allowed_workspace_classes are the IDs of classes, which can be used by
      * workspaces in an organization. Pass an empty array to allow all workspace
-     * classes
+     * classes.
+     * Only updates if update_allowed_workspace_classes is true.
      * </pre>
      *
      * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -12996,8 +13050,8 @@ public java.lang.String getAllowedWorkspaceClasses(int index) {
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -13011,8 +13065,8 @@ public java.lang.String getAllowedWorkspaceClasses(int index) {
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -13025,8 +13079,8 @@ public int getRestrictedEditorNamesCount() {
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -13040,8 +13094,8 @@ public java.lang.String getRestrictedEditorNames(int index) {
      * <pre>
      * restricted_editor_names updates the list of restricted editor names that
      * are not allowed to be used by workspaces in an organization. If empty, all
-     * editors are allowed. Only updates if update_restricted_editor_names is
-     * true.
+     * editors are allowed.
+     * Only updates if update_restricted_editor_names is true.
      * </pre>
      *
      * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -13109,7 +13163,8 @@ public int getPinnedEditorVersionsCount() {
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -13131,7 +13186,8 @@ public java.util.Map<java.lang.String, java.lang.String> getPinnedEditorVersions
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -13143,7 +13199,8 @@ public java.util.Map<java.lang.String, java.lang.String> getPinnedEditorVersions
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -13162,7 +13219,8 @@ java.lang.String getPinnedEditorVersionsOrDefault(
     /**
      * <pre>
      * pinned_editor_versions updates the pinned version for the corresponding
-     * editor
+     * editor.
+     * Only updates if update_pinned_editor_versions is true.
      * </pre>
      *
      * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -13307,6 +13365,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.TimeoutSettingsOrBuilder ge
     @SuppressWarnings("serial")
     private java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry> roleRestrictions_;
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     @java.lang.Override
@@ -13314,6 +13376,10 @@ public java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrict
       return roleRestrictions_;
     }
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     @java.lang.Override
@@ -13322,6 +13388,10 @@ public java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrict
       return roleRestrictions_;
     }
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     @java.lang.Override
@@ -13329,6 +13399,10 @@ public int getRoleRestrictionsCount() {
       return roleRestrictions_.size();
     }
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     @java.lang.Override
@@ -13336,6 +13410,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry getRol
       return roleRestrictions_.get(index);
     }
     /**
+     * <pre>
+     * Only updates if update_role_restrictions is true.
+     * </pre>
+     *
      * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
      */
     @java.lang.Override
@@ -13471,6 +13549,35 @@ public boolean getAnnotateGitCommits() {
       return annotateGitCommits_;
     }
 
+    public static final int UPDATE_ALLOWED_WORKSPACE_CLASSES_FIELD_NUMBER = 18;
+    private boolean updateAllowedWorkspaceClasses_ = false;
+    /**
+     * <pre>
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
+     * </pre>
+     *
+     * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+     * @return Whether the updateAllowedWorkspaceClasses field is set.
+     */
+    @java.lang.Override
+    public boolean hasUpdateAllowedWorkspaceClasses() {
+      return ((bitField0_ & 0x00000400) != 0);
+    }
+    /**
+     * <pre>
+     * update_role_restrictions specifies whether role_restrictions should be
+     * updated
+     * </pre>
+     *
+     * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+     * @return The updateAllowedWorkspaceClasses.
+     */
+    @java.lang.Override
+    public boolean getUpdateAllowedWorkspaceClasses() {
+      return updateAllowedWorkspaceClasses_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -13533,6 +13640,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000200) != 0)) {
         output.writeBool(17, annotateGitCommits_);
       }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        output.writeBool(18, updateAllowedWorkspaceClasses_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -13613,6 +13723,10 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(17, annotateGitCommits_);
       }
+      if (((bitField0_ & 0x00000400) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(18, updateAllowedWorkspaceClasses_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -13688,6 +13802,11 @@ public boolean equals(final java.lang.Object obj) {
         if (getAnnotateGitCommits()
             != other.getAnnotateGitCommits()) return false;
       }
+      if (hasUpdateAllowedWorkspaceClasses() != other.hasUpdateAllowedWorkspaceClasses()) return false;
+      if (hasUpdateAllowedWorkspaceClasses()) {
+        if (getUpdateAllowedWorkspaceClasses()
+            != other.getUpdateAllowedWorkspaceClasses()) return false;
+      }
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -13762,6 +13881,11 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
             getAnnotateGitCommits());
       }
+      if (hasUpdateAllowedWorkspaceClasses()) {
+        hash = (37 * hash) + UPDATE_ALLOWED_WORKSPACE_CLASSES_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getUpdateAllowedWorkspaceClasses());
+      }
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -13954,6 +14078,7 @@ public Builder clear() {
           onboardingSettingsBuilder_ = null;
         }
         annotateGitCommits_ = false;
+        updateAllowedWorkspaceClasses_ = false;
         return this;
       }
 
@@ -14060,6 +14185,10 @@ private void buildPartial0(io.gitpod.publicapi.v1.OrganizationOuterClass.UpdateO
           result.annotateGitCommits_ = annotateGitCommits_;
           to_bitField0_ |= 0x00000200;
         }
+        if (((from_bitField0_ & 0x00008000) != 0)) {
+          result.updateAllowedWorkspaceClasses_ = updateAllowedWorkspaceClasses_;
+          to_bitField0_ |= 0x00000400;
+        }
         result.bitField0_ |= to_bitField0_;
       }
 
@@ -14163,6 +14292,9 @@ public Builder mergeFrom(io.gitpod.publicapi.v1.OrganizationOuterClass.UpdateOrg
         if (other.hasAnnotateGitCommits()) {
           setAnnotateGitCommits(other.getAnnotateGitCommits());
         }
+        if (other.hasUpdateAllowedWorkspaceClasses()) {
+          setUpdateAllowedWorkspaceClasses(other.getUpdateAllowedWorkspaceClasses());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -14282,6 +14414,11 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00004000;
                 break;
               } // case 136
+              case 144: {
+                updateAllowedWorkspaceClasses_ = input.readBool();
+                bitField0_ |= 0x00008000;
+                break;
+              } // case 144
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -14546,7 +14683,8 @@ private void ensureAllowedWorkspaceClassesIsMutable() {
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14561,7 +14699,8 @@ private void ensureAllowedWorkspaceClassesIsMutable() {
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14574,7 +14713,8 @@ public int getAllowedWorkspaceClassesCount() {
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14588,7 +14728,8 @@ public java.lang.String getAllowedWorkspaceClasses(int index) {
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14603,7 +14744,8 @@ public java.lang.String getAllowedWorkspaceClasses(int index) {
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14624,7 +14766,8 @@ public Builder setAllowedWorkspaceClasses(
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14644,7 +14787,8 @@ public Builder addAllowedWorkspaceClasses(
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14664,7 +14808,8 @@ public Builder addAllAllowedWorkspaceClasses(
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14681,7 +14826,8 @@ public Builder clearAllowedWorkspaceClasses() {
        * <pre>
        * allowed_workspace_classes are the IDs of classes, which can be used by
        * workspaces in an organization. Pass an empty array to allow all workspace
-       * classes
+       * classes.
+       * Only updates if update_allowed_workspace_classes is true.
        * </pre>
        *
        * <code>repeated string allowed_workspace_classes = 5 [json_name = "allowedWorkspaceClasses"];</code>
@@ -14711,8 +14857,8 @@ private void ensureRestrictedEditorNamesIsMutable() {
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14727,8 +14873,8 @@ private void ensureRestrictedEditorNamesIsMutable() {
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14741,8 +14887,8 @@ public int getRestrictedEditorNamesCount() {
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14756,8 +14902,8 @@ public java.lang.String getRestrictedEditorNames(int index) {
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14772,8 +14918,8 @@ public java.lang.String getRestrictedEditorNames(int index) {
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14794,8 +14940,8 @@ public Builder setRestrictedEditorNames(
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14815,8 +14961,8 @@ public Builder addRestrictedEditorNames(
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14836,8 +14982,8 @@ public Builder addAllRestrictedEditorNames(
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14854,8 +15000,8 @@ public Builder clearRestrictedEditorNames() {
        * <pre>
        * restricted_editor_names updates the list of restricted editor names that
        * are not allowed to be used by workspaces in an organization. If empty, all
-       * editors are allowed. Only updates if update_restricted_editor_names is
-       * true.
+       * editors are allowed.
+       * Only updates if update_restricted_editor_names is true.
        * </pre>
        *
        * <code>repeated string restricted_editor_names = 6 [json_name = "restrictedEditorNames"];</code>
@@ -14958,7 +15104,8 @@ public int getPinnedEditorVersionsCount() {
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -14980,7 +15127,8 @@ public java.util.Map<java.lang.String, java.lang.String> getPinnedEditorVersions
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -14992,7 +15140,8 @@ public java.util.Map<java.lang.String, java.lang.String> getPinnedEditorVersions
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -15011,7 +15160,8 @@ java.lang.String getPinnedEditorVersionsOrDefault(
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -15036,7 +15186,8 @@ public Builder clearPinnedEditorVersions() {
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -15060,7 +15211,8 @@ public Builder removePinnedEditorVersions(
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -15078,7 +15230,8 @@ public Builder putPinnedEditorVersions(
       /**
        * <pre>
        * pinned_editor_versions updates the pinned version for the corresponding
-       * editor
+       * editor.
+       * Only updates if update_pinned_editor_versions is true.
        * </pre>
        *
        * <code>map&lt;string, string&gt; pinned_editor_versions = 8 [json_name = "pinnedEditorVersions"];</code>
@@ -15420,6 +15573,10 @@ private void ensureRoleRestrictionsIsMutable() {
           io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry, io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builder, io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder> roleRestrictionsBuilder_;
 
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry> getRoleRestrictionsList() {
@@ -15430,6 +15587,10 @@ public java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrict
         }
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public int getRoleRestrictionsCount() {
@@ -15440,6 +15601,10 @@ public int getRoleRestrictionsCount() {
         }
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry getRoleRestrictions(int index) {
@@ -15450,6 +15615,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry getRol
         }
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder setRoleRestrictions(
@@ -15467,6 +15636,10 @@ public Builder setRoleRestrictions(
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder setRoleRestrictions(
@@ -15481,6 +15654,10 @@ public Builder setRoleRestrictions(
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder addRoleRestrictions(io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry value) {
@@ -15497,6 +15674,10 @@ public Builder addRoleRestrictions(io.gitpod.publicapi.v1.OrganizationOuterClass
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder addRoleRestrictions(
@@ -15514,6 +15695,10 @@ public Builder addRoleRestrictions(
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder addRoleRestrictions(
@@ -15528,6 +15713,10 @@ public Builder addRoleRestrictions(
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder addRoleRestrictions(
@@ -15542,6 +15731,10 @@ public Builder addRoleRestrictions(
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder addAllRoleRestrictions(
@@ -15557,6 +15750,10 @@ public Builder addAllRoleRestrictions(
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder clearRoleRestrictions() {
@@ -15570,6 +15767,10 @@ public Builder clearRoleRestrictions() {
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public Builder removeRoleRestrictions(int index) {
@@ -15583,6 +15784,10 @@ public Builder removeRoleRestrictions(int index) {
         return this;
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builder getRoleRestrictionsBuilder(
@@ -15590,6 +15795,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builde
         return getRoleRestrictionsFieldBuilder().getBuilder(index);
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder getRoleRestrictionsOrBuilder(
@@ -15600,6 +15809,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuild
         }
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public java.util.List<? extends io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuilder>
@@ -15611,6 +15824,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntryOrBuild
         }
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builder addRoleRestrictionsBuilder() {
@@ -15618,6 +15835,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builde
             io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.getDefaultInstance());
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builder addRoleRestrictionsBuilder(
@@ -15626,6 +15847,10 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builde
             index, io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.getDefaultInstance());
       }
       /**
+       * <pre>
+       * Only updates if update_role_restrictions is true.
+       * </pre>
+       *
        * <code>repeated .gitpod.v1.RoleRestrictionEntry role_restrictions = 12 [json_name = "roleRestrictions"];</code>
        */
       public java.util.List<io.gitpod.publicapi.v1.OrganizationOuterClass.RoleRestrictionEntry.Builder>
@@ -15988,6 +16213,66 @@ public Builder clearAnnotateGitCommits() {
         return this;
       }
 
+      private boolean updateAllowedWorkspaceClasses_ ;
+      /**
+       * <pre>
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
+       * </pre>
+       *
+       * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+       * @return Whether the updateAllowedWorkspaceClasses field is set.
+       */
+      @java.lang.Override
+      public boolean hasUpdateAllowedWorkspaceClasses() {
+        return ((bitField0_ & 0x00008000) != 0);
+      }
+      /**
+       * <pre>
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
+       * </pre>
+       *
+       * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+       * @return The updateAllowedWorkspaceClasses.
+       */
+      @java.lang.Override
+      public boolean getUpdateAllowedWorkspaceClasses() {
+        return updateAllowedWorkspaceClasses_;
+      }
+      /**
+       * <pre>
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
+       * </pre>
+       *
+       * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+       * @param value The updateAllowedWorkspaceClasses to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUpdateAllowedWorkspaceClasses(boolean value) {
+
+        updateAllowedWorkspaceClasses_ = value;
+        bitField0_ |= 0x00008000;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * update_role_restrictions specifies whether role_restrictions should be
+       * updated
+       * </pre>
+       *
+       * <code>optional bool update_allowed_workspace_classes = 18 [json_name = "updateAllowedWorkspaceClasses"];</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUpdateAllowedWorkspaceClasses() {
+        bitField0_ = (bitField0_ & ~0x00008000);
+        updateAllowedWorkspaceClasses_ = false;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:gitpod.v1.UpdateOrganizationSettingsRequest)
     }
 
@@ -31126,7 +31411,7 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.DeleteOrganizationMemberRes
       "\022>\n\ninactivity\030\001 \001(\0132\031.google.protobuf.D" +
       "urationH\000R\ninactivity\210\001\001\0221\n\022deny_user_ti" +
       "meouts\030\002 \001(\010H\001R\020denyUserTimeouts\210\001\001B\r\n\013_" +
-      "inactivityB\025\n\023_deny_user_timeouts\"\212\013\n!Up" +
+      "inactivityB\025\n\023_deny_user_timeouts\"\375\013\n!Up" +
       "dateOrganizationSettingsRequest\022\'\n\017organ" +
       "ization_id\030\001 \001(\tR\016organizationId\022A\n\032work" +
       "space_sharing_disabled\030\003 \001(\010H\000R\030workspac" +
@@ -31153,119 +31438,122 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.DeleteOrganizationMemberRes
       "\001\022S\n\023onboarding_settings\030\020 \001(\0132\035.gitpod." +
       "v1.OnboardingSettingsH\010R\022onboardingSetti" +
       "ngs\210\001\001\0225\n\024annotate_git_commits\030\021 \001(\010H\tR\022" +
-      "annotateGitCommits\210\001\001\032G\n\031PinnedEditorVer" +
-      "sionsEntry\022\020\n\003key\030\001 \001(\tR\003key\022\024\n\005value\030\002 " +
-      "\001(\tR\005value:\0028\001B\035\n\033_workspace_sharing_dis" +
-      "abledB\032\n\030_default_workspace_imageB!\n\037_up" +
-      "date_restricted_editor_namesB \n\036_update_" +
-      "pinned_editor_versionsB\017\n\r_default_roleB" +
-      "\023\n\021_timeout_settingsB\033\n\031_update_role_res" +
-      "trictionsB\"\n _max_parallel_running_works" +
-      "pacesB\026\n\024_onboarding_settingsB\027\n\025_annota" +
-      "te_git_commits\"a\n\"UpdateOrganizationSett" +
-      "ingsResponse\022;\n\010settings\030\001 \001(\0132\037.gitpod." +
-      "v1.OrganizationSettingsR\010settings\"I\n\036Get" +
-      "OrganizationSettingsRequest\022\'\n\017organizat" +
-      "ion_id\030\001 \001(\tR\016organizationId\"^\n\037GetOrgan" +
-      "izationSettingsResponse\022;\n\010settings\030\001 \001(" +
-      "\0132\037.gitpod.v1.OrganizationSettingsR\010sett" +
-      "ings\"/\n\031CreateOrganizationRequest\022\022\n\004nam" +
-      "e\030\001 \001(\tR\004name\"Y\n\032CreateOrganizationRespo" +
-      "nse\022;\n\014organization\030\001 \001(\0132\027.gitpod.v1.Or" +
-      "ganizationR\014organization\"A\n\026GetOrganizat" +
-      "ionRequest\022\'\n\017organization_id\030\001 \001(\tR\016org" +
-      "anizationId\"V\n\027GetOrganizationResponse\022;" +
+      "annotateGitCommits\210\001\001\022L\n update_allowed_" +
+      "workspace_classes\030\022 \001(\010H\nR\035updateAllowed" +
+      "WorkspaceClasses\210\001\001\032G\n\031PinnedEditorVersi" +
+      "onsEntry\022\020\n\003key\030\001 \001(\tR\003key\022\024\n\005value\030\002 \001(" +
+      "\tR\005value:\0028\001B\035\n\033_workspace_sharing_disab" +
+      "ledB\032\n\030_default_workspace_imageB!\n\037_upda" +
+      "te_restricted_editor_namesB \n\036_update_pi" +
+      "nned_editor_versionsB\017\n\r_default_roleB\023\n" +
+      "\021_timeout_settingsB\033\n\031_update_role_restr" +
+      "ictionsB\"\n _max_parallel_running_workspa" +
+      "cesB\026\n\024_onboarding_settingsB\027\n\025_annotate" +
+      "_git_commitsB#\n!_update_allowed_workspac" +
+      "e_classes\"a\n\"UpdateOrganizationSettingsR" +
+      "esponse\022;\n\010settings\030\001 \001(\0132\037.gitpod.v1.Or" +
+      "ganizationSettingsR\010settings\"I\n\036GetOrgan" +
+      "izationSettingsRequest\022\'\n\017organization_i" +
+      "d\030\001 \001(\tR\016organizationId\"^\n\037GetOrganizati" +
+      "onSettingsResponse\022;\n\010settings\030\001 \001(\0132\037.g" +
+      "itpod.v1.OrganizationSettingsR\010settings\"" +
+      "/\n\031CreateOrganizationRequest\022\022\n\004name\030\001 \001" +
+      "(\tR\004name\"Y\n\032CreateOrganizationResponse\022;" +
       "\n\014organization\030\001 \001(\0132\027.gitpod.v1.Organiz" +
-      "ationR\014organization\"\332\001\n\030ListOrganization" +
-      "sRequest\022<\n\npagination\030\001 \001(\0132\034.gitpod.v1" +
-      ".PaginationRequestR\npagination\022?\n\005scope\030" +
-      "\002 \001(\0162).gitpod.v1.ListOrganizationsReque" +
-      "st.ScopeR\005scope\"?\n\005Scope\022\025\n\021SCOPE_UNSPEC" +
-      "IFIED\020\000\022\020\n\014SCOPE_MEMBER\020\001\022\r\n\tSCOPE_ALL\020\002" +
-      "\"\231\001\n\031ListOrganizationsResponse\022=\n\rorgani" +
-      "zations\030\001 \003(\0132\027.gitpod.v1.OrganizationR\r" +
-      "organizations\022=\n\npagination\030\002 \001(\0132\035.gitp" +
-      "od.v1.PaginationResponseR\npagination\"D\n\031" +
-      "DeleteOrganizationRequest\022\'\n\017organizatio" +
-      "n_id\030\001 \001(\tR\016organizationId\"\034\n\032DeleteOrga" +
-      "nizationResponse\"K\n GetOrganizationInvit" +
-      "ationRequest\022\'\n\017organization_id\030\001 \001(\tR\016o" +
-      "rganizationId\"H\n!GetOrganizationInvitati" +
-      "onResponse\022#\n\rinvitation_id\030\001 \001(\tR\014invit" +
-      "ationId\">\n\027JoinOrganizationRequest\022#\n\rin" +
-      "vitation_id\030\001 \001(\tR\014invitationId\"C\n\030JoinO" +
-      "rganizationResponse\022\'\n\017organization_id\030\001" +
-      " \001(\tR\016organizationId\"M\n\"ResetOrganizatio" +
-      "nInvitationRequest\022\'\n\017organization_id\030\001 " +
-      "\001(\tR\016organizationId\"J\n#ResetOrganization" +
-      "InvitationResponse\022#\n\rinvitation_id\030\001 \001(" +
-      "\tR\014invitationId\"\207\001\n\036ListOrganizationMemb" +
-      "ersRequest\022\'\n\017organization_id\030\001 \001(\tR\016org" +
-      "anizationId\022<\n\npagination\030\002 \001(\0132\034.gitpod" +
-      ".v1.PaginationRequestR\npagination\"\231\001\n\037Li" +
-      "stOrganizationMembersResponse\0227\n\007members" +
-      "\030\001 \003(\0132\035.gitpod.v1.OrganizationMemberR\007m" +
-      "embers\022=\n\npagination\030\002 \001(\0132\035.gitpod.v1.P" +
-      "aginationResponseR\npagination\"\242\001\n\037Update" +
-      "OrganizationMemberRequest\022\'\n\017organizatio" +
-      "n_id\030\001 \001(\tR\016organizationId\022\027\n\007user_id\030\002 " +
-      "\001(\tR\006userId\0224\n\004role\030\003 \001(\0162\033.gitpod.v1.Or" +
-      "ganizationRoleH\000R\004role\210\001\001B\007\n\005_role\"Y\n Up" +
-      "dateOrganizationMemberResponse\0225\n\006member" +
-      "\030\001 \001(\0132\035.gitpod.v1.OrganizationMemberR\006m" +
-      "ember\"c\n\037DeleteOrganizationMemberRequest" +
-      "\022\'\n\017organization_id\030\001 \001(\tR\016organizationI" +
-      "d\022\027\n\007user_id\030\002 \001(\tR\006userId\"\"\n DeleteOrga" +
-      "nizationMemberResponse*\224\001\n\020OrganizationR" +
-      "ole\022!\n\035ORGANIZATION_ROLE_UNSPECIFIED\020\000\022\033" +
-      "\n\027ORGANIZATION_ROLE_OWNER\020\001\022\034\n\030ORGANIZAT" +
-      "ION_ROLE_MEMBER\020\002\022\"\n\036ORGANIZATION_ROLE_C" +
-      "OLLABORATOR\020\003*t\n\026OrganizationPermission\022" +
-      "\'\n#ORGANIZATION_PERMISSION_UNSPECIFIED\020\000" +
-      "\0221\n-ORGANIZATION_PERMISSION_START_ARBITR" +
-      "ARY_REPOS\020\0012\276\014\n\023OrganizationService\022c\n\022C" +
-      "reateOrganization\022$.gitpod.v1.CreateOrga" +
-      "nizationRequest\032%.gitpod.v1.CreateOrgani" +
-      "zationResponse\"\000\022Z\n\017GetOrganization\022!.gi" +
-      "tpod.v1.GetOrganizationRequest\032\".gitpod." +
-      "v1.GetOrganizationResponse\"\000\022c\n\022UpdateOr" +
-      "ganization\022$.gitpod.v1.UpdateOrganizatio" +
-      "nRequest\032%.gitpod.v1.UpdateOrganizationR" +
-      "esponse\"\000\022`\n\021ListOrganizations\022#.gitpod." +
-      "v1.ListOrganizationsRequest\032$.gitpod.v1." +
-      "ListOrganizationsResponse\"\000\022c\n\022DeleteOrg" +
-      "anization\022$.gitpod.v1.DeleteOrganization" +
-      "Request\032%.gitpod.v1.DeleteOrganizationRe" +
-      "sponse\"\000\022x\n\031GetOrganizationInvitation\022+." +
-      "gitpod.v1.GetOrganizationInvitationReque" +
-      "st\032,.gitpod.v1.GetOrganizationInvitation" +
-      "Response\"\000\022]\n\020JoinOrganization\022\".gitpod." +
-      "v1.JoinOrganizationRequest\032#.gitpod.v1.J" +
-      "oinOrganizationResponse\"\000\022~\n\033ResetOrgani" +
-      "zationInvitation\022-.gitpod.v1.ResetOrgani" +
-      "zationInvitationRequest\032..gitpod.v1.Rese" +
-      "tOrganizationInvitationResponse\"\000\022r\n\027Lis" +
-      "tOrganizationMembers\022).gitpod.v1.ListOrg" +
-      "anizationMembersRequest\032*.gitpod.v1.List" +
-      "OrganizationMembersResponse\"\000\022u\n\030UpdateO" +
-      "rganizationMember\022*.gitpod.v1.UpdateOrga" +
-      "nizationMemberRequest\032+.gitpod.v1.Update" +
-      "OrganizationMemberResponse\"\000\022u\n\030DeleteOr" +
-      "ganizationMember\022*.gitpod.v1.DeleteOrgan" +
-      "izationMemberRequest\032+.gitpod.v1.DeleteO" +
-      "rganizationMemberResponse\"\000\022r\n\027GetOrgani" +
-      "zationSettings\022).gitpod.v1.GetOrganizati" +
-      "onSettingsRequest\032*.gitpod.v1.GetOrganiz" +
-      "ationSettingsResponse\"\000\022{\n\032UpdateOrganiz" +
-      "ationSettings\022,.gitpod.v1.UpdateOrganiza" +
-      "tionSettingsRequest\032-.gitpod.v1.UpdateOr" +
-      "ganizationSettingsResponse\"\000\022\215\001\n ListOrg" +
-      "anizationWorkspaceClasses\0222.gitpod.v1.Li" +
-      "stOrganizationWorkspaceClassesRequest\0323." +
-      "gitpod.v1.ListOrganizationWorkspaceClass" +
-      "esResponse\"\000BQ\n\026io.gitpod.publicapi.v1Z7" +
-      "github.com/gitpod-io/gitpod/components/p" +
-      "ublic-api/go/v1b\006proto3"
+      "ationR\014organization\"A\n\026GetOrganizationRe" +
+      "quest\022\'\n\017organization_id\030\001 \001(\tR\016organiza" +
+      "tionId\"V\n\027GetOrganizationResponse\022;\n\014org" +
+      "anization\030\001 \001(\0132\027.gitpod.v1.Organization" +
+      "R\014organization\"\332\001\n\030ListOrganizationsRequ" +
+      "est\022<\n\npagination\030\001 \001(\0132\034.gitpod.v1.Pagi" +
+      "nationRequestR\npagination\022?\n\005scope\030\002 \001(\016" +
+      "2).gitpod.v1.ListOrganizationsRequest.Sc" +
+      "opeR\005scope\"?\n\005Scope\022\025\n\021SCOPE_UNSPECIFIED" +
+      "\020\000\022\020\n\014SCOPE_MEMBER\020\001\022\r\n\tSCOPE_ALL\020\002\"\231\001\n\031" +
+      "ListOrganizationsResponse\022=\n\rorganizatio" +
+      "ns\030\001 \003(\0132\027.gitpod.v1.OrganizationR\rorgan" +
+      "izations\022=\n\npagination\030\002 \001(\0132\035.gitpod.v1" +
+      ".PaginationResponseR\npagination\"D\n\031Delet" +
+      "eOrganizationRequest\022\'\n\017organization_id\030" +
+      "\001 \001(\tR\016organizationId\"\034\n\032DeleteOrganizat" +
+      "ionResponse\"K\n GetOrganizationInvitation" +
+      "Request\022\'\n\017organization_id\030\001 \001(\tR\016organi" +
+      "zationId\"H\n!GetOrganizationInvitationRes" +
+      "ponse\022#\n\rinvitation_id\030\001 \001(\tR\014invitation" +
+      "Id\">\n\027JoinOrganizationRequest\022#\n\rinvitat" +
+      "ion_id\030\001 \001(\tR\014invitationId\"C\n\030JoinOrgani" +
+      "zationResponse\022\'\n\017organization_id\030\001 \001(\tR" +
+      "\016organizationId\"M\n\"ResetOrganizationInvi" +
+      "tationRequest\022\'\n\017organization_id\030\001 \001(\tR\016" +
+      "organizationId\"J\n#ResetOrganizationInvit" +
+      "ationResponse\022#\n\rinvitation_id\030\001 \001(\tR\014in" +
+      "vitationId\"\207\001\n\036ListOrganizationMembersRe" +
+      "quest\022\'\n\017organization_id\030\001 \001(\tR\016organiza" +
+      "tionId\022<\n\npagination\030\002 \001(\0132\034.gitpod.v1.P" +
+      "aginationRequestR\npagination\"\231\001\n\037ListOrg" +
+      "anizationMembersResponse\0227\n\007members\030\001 \003(" +
+      "\0132\035.gitpod.v1.OrganizationMemberR\007member" +
+      "s\022=\n\npagination\030\002 \001(\0132\035.gitpod.v1.Pagina" +
+      "tionResponseR\npagination\"\242\001\n\037UpdateOrgan" +
+      "izationMemberRequest\022\'\n\017organization_id\030" +
+      "\001 \001(\tR\016organizationId\022\027\n\007user_id\030\002 \001(\tR\006" +
+      "userId\0224\n\004role\030\003 \001(\0162\033.gitpod.v1.Organiz" +
+      "ationRoleH\000R\004role\210\001\001B\007\n\005_role\"Y\n UpdateO" +
+      "rganizationMemberResponse\0225\n\006member\030\001 \001(" +
+      "\0132\035.gitpod.v1.OrganizationMemberR\006member" +
+      "\"c\n\037DeleteOrganizationMemberRequest\022\'\n\017o" +
+      "rganization_id\030\001 \001(\tR\016organizationId\022\027\n\007" +
+      "user_id\030\002 \001(\tR\006userId\"\"\n DeleteOrganizat" +
+      "ionMemberResponse*\224\001\n\020OrganizationRole\022!" +
+      "\n\035ORGANIZATION_ROLE_UNSPECIFIED\020\000\022\033\n\027ORG" +
+      "ANIZATION_ROLE_OWNER\020\001\022\034\n\030ORGANIZATION_R" +
+      "OLE_MEMBER\020\002\022\"\n\036ORGANIZATION_ROLE_COLLAB" +
+      "ORATOR\020\003*t\n\026OrganizationPermission\022\'\n#OR" +
+      "GANIZATION_PERMISSION_UNSPECIFIED\020\000\0221\n-O" +
+      "RGANIZATION_PERMISSION_START_ARBITRARY_R" +
+      "EPOS\020\0012\276\014\n\023OrganizationService\022c\n\022Create" +
+      "Organization\022$.gitpod.v1.CreateOrganizat" +
+      "ionRequest\032%.gitpod.v1.CreateOrganizatio" +
+      "nResponse\"\000\022Z\n\017GetOrganization\022!.gitpod." +
+      "v1.GetOrganizationRequest\032\".gitpod.v1.Ge" +
+      "tOrganizationResponse\"\000\022c\n\022UpdateOrganiz" +
+      "ation\022$.gitpod.v1.UpdateOrganizationRequ" +
+      "est\032%.gitpod.v1.UpdateOrganizationRespon" +
+      "se\"\000\022`\n\021ListOrganizations\022#.gitpod.v1.Li" +
+      "stOrganizationsRequest\032$.gitpod.v1.ListO" +
+      "rganizationsResponse\"\000\022c\n\022DeleteOrganiza" +
+      "tion\022$.gitpod.v1.DeleteOrganizationReque" +
+      "st\032%.gitpod.v1.DeleteOrganizationRespons" +
+      "e\"\000\022x\n\031GetOrganizationInvitation\022+.gitpo" +
+      "d.v1.GetOrganizationInvitationRequest\032,." +
+      "gitpod.v1.GetOrganizationInvitationRespo" +
+      "nse\"\000\022]\n\020JoinOrganization\022\".gitpod.v1.Jo" +
+      "inOrganizationRequest\032#.gitpod.v1.JoinOr" +
+      "ganizationResponse\"\000\022~\n\033ResetOrganizatio" +
+      "nInvitation\022-.gitpod.v1.ResetOrganizatio" +
+      "nInvitationRequest\032..gitpod.v1.ResetOrga" +
+      "nizationInvitationResponse\"\000\022r\n\027ListOrga" +
+      "nizationMembers\022).gitpod.v1.ListOrganiza" +
+      "tionMembersRequest\032*.gitpod.v1.ListOrgan" +
+      "izationMembersResponse\"\000\022u\n\030UpdateOrgani" +
+      "zationMember\022*.gitpod.v1.UpdateOrganizat" +
+      "ionMemberRequest\032+.gitpod.v1.UpdateOrgan" +
+      "izationMemberResponse\"\000\022u\n\030DeleteOrganiz" +
+      "ationMember\022*.gitpod.v1.DeleteOrganizati" +
+      "onMemberRequest\032+.gitpod.v1.DeleteOrgani" +
+      "zationMemberResponse\"\000\022r\n\027GetOrganizatio" +
+      "nSettings\022).gitpod.v1.GetOrganizationSet" +
+      "tingsRequest\032*.gitpod.v1.GetOrganization" +
+      "SettingsResponse\"\000\022{\n\032UpdateOrganization" +
+      "Settings\022,.gitpod.v1.UpdateOrganizationS" +
+      "ettingsRequest\032-.gitpod.v1.UpdateOrganiz" +
+      "ationSettingsResponse\"\000\022\215\001\n ListOrganiza" +
+      "tionWorkspaceClasses\0222.gitpod.v1.ListOrg" +
+      "anizationWorkspaceClassesRequest\0323.gitpo" +
+      "d.v1.ListOrganizationWorkspaceClassesRes" +
+      "ponse\"\000BQ\n\026io.gitpod.publicapi.v1Z7githu" +
+      "b.com/gitpod-io/gitpod/components/public" +
+      "-api/go/v1b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -31352,7 +31640,7 @@ public io.gitpod.publicapi.v1.OrganizationOuterClass.DeleteOrganizationMemberRes
     internal_static_gitpod_v1_UpdateOrganizationSettingsRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_gitpod_v1_UpdateOrganizationSettingsRequest_descriptor,
-        new java.lang.String[] { "OrganizationId", "WorkspaceSharingDisabled", "DefaultWorkspaceImage", "AllowedWorkspaceClasses", "RestrictedEditorNames", "UpdateRestrictedEditorNames", "PinnedEditorVersions", "UpdatePinnedEditorVersions", "DefaultRole", "TimeoutSettings", "RoleRestrictions", "UpdateRoleRestrictions", "MaxParallelRunningWorkspaces", "OnboardingSettings", "AnnotateGitCommits", });
+        new java.lang.String[] { "OrganizationId", "WorkspaceSharingDisabled", "DefaultWorkspaceImage", "AllowedWorkspaceClasses", "RestrictedEditorNames", "UpdateRestrictedEditorNames", "PinnedEditorVersions", "UpdatePinnedEditorVersions", "DefaultRole", "TimeoutSettings", "RoleRestrictions", "UpdateRoleRestrictions", "MaxParallelRunningWorkspaces", "OnboardingSettings", "AnnotateGitCommits", "UpdateAllowedWorkspaceClasses", });
     internal_static_gitpod_v1_UpdateOrganizationSettingsRequest_PinnedEditorVersionsEntry_descriptor =
       internal_static_gitpod_v1_UpdateOrganizationSettingsRequest_descriptor.getNestedTypes().get(0);
     internal_static_gitpod_v1_UpdateOrganizationSettingsRequest_PinnedEditorVersionsEntry_fieldAccessorTable = new
diff --git a/components/public-api/typescript/src/gitpod/v1/organization_pb.ts b/components/public-api/typescript/src/gitpod/v1/organization_pb.ts
index f40fdae1b3d2eb..60d5a61577963c 100644
--- a/components/public-api/typescript/src/gitpod/v1/organization_pb.ts
+++ b/components/public-api/typescript/src/gitpod/v1/organization_pb.ts
@@ -728,7 +728,8 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
   /**
    * allowed_workspace_classes are the IDs of classes, which can be used by
    * workspaces in an organization. Pass an empty array to allow all workspace
-   * classes
+   * classes.
+   * Only updates if update_allowed_workspace_classes is true.
    *
    * @generated from field: repeated string allowed_workspace_classes = 5;
    */
@@ -737,8 +738,8 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
   /**
    * restricted_editor_names updates the list of restricted editor names that
    * are not allowed to be used by workspaces in an organization. If empty, all
-   * editors are allowed. Only updates if update_restricted_editor_names is
-   * true.
+   * editors are allowed.
+   * Only updates if update_restricted_editor_names is true.
    *
    * @generated from field: repeated string restricted_editor_names = 6;
    */
@@ -753,7 +754,8 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
 
   /**
    * pinned_editor_versions updates the pinned version for the corresponding
-   * editor
+   * editor.
+   * Only updates if update_pinned_editor_versions is true.
    *
    * @generated from field: map<string, string> pinned_editor_versions = 8;
    */
@@ -781,6 +783,8 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
   timeoutSettings?: TimeoutSettings;
 
   /**
+   * Only updates if update_role_restrictions is true.
+   *
    * @generated from field: repeated gitpod.v1.RoleRestrictionEntry role_restrictions = 12;
    */
   roleRestrictions: RoleRestrictionEntry[] = [];
@@ -817,6 +821,14 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
    */
   annotateGitCommits?: boolean;
 
+  /**
+   * update_role_restrictions specifies whether role_restrictions should be
+   * updated
+   *
+   * @generated from field: optional bool update_allowed_workspace_classes = 18;
+   */
+  updateAllowedWorkspaceClasses?: boolean;
+
   constructor(data?: PartialMessage<UpdateOrganizationSettingsRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -840,6 +852,7 @@ export class UpdateOrganizationSettingsRequest extends Message<UpdateOrganizatio
     { no: 15, name: "max_parallel_running_workspaces", kind: "scalar", T: 5 /* ScalarType.INT32 */, opt: true },
     { no: 16, name: "onboarding_settings", kind: "message", T: OnboardingSettings, opt: true },
     { no: 17, name: "annotate_git_commits", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
+    { no: 18, name: "update_allowed_workspace_classes", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UpdateOrganizationSettingsRequest {
diff --git a/components/server/src/api/organization-service-api.ts b/components/server/src/api/organization-service-api.ts
index 8278213d6c96cf..506fe33a9fee22 100644
--- a/components/server/src/api/organization-service-api.ts
+++ b/components/server/src/api/organization-service-api.ts
@@ -266,13 +266,23 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
                 "updateRestrictedEditorNames is required to be true to update restrictedEditorNames",
             );
         }
+
+        if (!req.updateAllowedWorkspaceClasses && req.allowedWorkspaceClasses.length > 0) {
+            throw new ApplicationError(
+                ErrorCodes.BAD_REQUEST,
+                "updateAllowedWorkspaceClasses is required to be true to update allowedWorkspaceClasses",
+            );
+        }
+        if (req.updateAllowedWorkspaceClasses) {
+            update.allowedWorkspaceClasses = req.allowedWorkspaceClasses;
+        }
+
         if (typeof req.workspaceSharingDisabled === "boolean") {
             update.workspaceSharingDisabled = req.workspaceSharingDisabled;
         }
         if (typeof req.defaultWorkspaceImage === "string") {
             update.defaultWorkspaceImage = req.defaultWorkspaceImage;
         }
-        update.allowedWorkspaceClasses = req.allowedWorkspaceClasses;
         if (req.updatePinnedEditorVersions) {
             update.pinnedEditorVersions = req.pinnedEditorVersions;
         }

From f0d6f5fe1697b2d70c74c5b07b56cbd41073469b Mon Sep 17 00:00:00 2001
From: Gero Posmyk-Leinemann <gero@gitpod.io>
Date: Fri, 14 Feb 2025 12:03:25 +0000
Subject: [PATCH 5/6] [dashboard] Fix updateOrgSettings API usage

Tool: gitpod/catfood.gitpod.cloud
---
 .../update-org-settings-mutation.ts           | 83 ++++++-------------
 .../dashboard/src/teams/TeamPolicies.tsx      |  7 +-
 2 files changed, 26 insertions(+), 64 deletions(-)

diff --git a/components/dashboard/src/data/organizations/update-org-settings-mutation.ts b/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
index c536da96c5804d..0bdd2c2cf210ba 100644
--- a/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
+++ b/components/dashboard/src/data/organizations/update-org-settings-mutation.ts
@@ -8,32 +8,16 @@ import { useMutation } from "@tanstack/react-query";
 import { useOrgSettingsQueryInvalidator } from "./org-settings-query";
 import { useCurrentOrg } from "./orgs-query";
 import { organizationClient } from "../../service/public-api";
-import { OrganizationSettings } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import {
+    OrganizationSettings,
+    UpdateOrganizationSettingsRequest,
+} from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { ErrorCode } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { useOrgWorkspaceClassesQueryInvalidator } from "./org-workspace-classes-query";
-import { PlainMessage } from "@bufbuild/protobuf";
 import { useOrgRepoSuggestionsInvalidator } from "./suggested-repositories-query";
+import { PartialMessage } from "@bufbuild/protobuf";
 
-export type UpdateOrganizationSettingsArgs = Partial<
-    Omit<
-        Pick<
-            PlainMessage<OrganizationSettings>,
-            | "workspaceSharingDisabled"
-            | "defaultWorkspaceImage"
-            | "allowedWorkspaceClasses"
-            | "pinnedEditorVersions"
-            | "restrictedEditorNames"
-            | "defaultRole"
-            | "timeoutSettings"
-            | "roleRestrictions"
-            | "maxParallelRunningWorkspaces"
-            | "annotateGitCommits"
-        >,
-        never
-    > & {
-        onboardingSettings?: Partial<PlainMessage<OrganizationSettings>["onboardingSettings"]>; // this enables us to not have to specify all of the onboarding settings on every update
-    }
->;
+export type UpdateOrganizationSettingsArgs = PartialMessage<UpdateOrganizationSettingsRequest>;
 
 export const useUpdateOrgSettingsMutation = () => {
     const org = useCurrentOrg().data;
@@ -43,43 +27,24 @@ export const useUpdateOrgSettingsMutation = () => {
     const organizationId = org?.id ?? "";
 
     return useMutation<OrganizationSettings, Error, UpdateOrganizationSettingsArgs>({
-        mutationFn: async ({
-            workspaceSharingDisabled,
-            defaultWorkspaceImage,
-            allowedWorkspaceClasses,
-            pinnedEditorVersions,
-            restrictedEditorNames,
-            defaultRole,
-            timeoutSettings,
-            roleRestrictions,
-            maxParallelRunningWorkspaces,
-            onboardingSettings,
-            annotateGitCommits,
-        }) => {
-            const settings = await organizationClient.updateOrganizationSettings({
-                organizationId,
-                workspaceSharingDisabled: workspaceSharingDisabled ?? false,
-                defaultWorkspaceImage,
-                allowedWorkspaceClasses,
-                updatePinnedEditorVersions: !!pinnedEditorVersions,
-                pinnedEditorVersions,
-                restrictedEditorNames,
-                updateRestrictedEditorNames: !!restrictedEditorNames,
-                defaultRole,
-                timeoutSettings,
-                roleRestrictions,
-                updateRoleRestrictions: !!roleRestrictions,
-                maxParallelRunningWorkspaces,
-                onboardingSettings: {
-                    ...onboardingSettings,
-                    updateRecommendedRepositories: !!onboardingSettings?.recommendedRepositories,
-                    welcomeMessage: {
-                        ...onboardingSettings?.welcomeMessage,
-                        featuredMemberResolvedAvatarUrl: undefined, // This field is not allowed to be set in the request.
-                    },
-                },
-                annotateGitCommits,
-            });
+        mutationFn: async (partialUpdate) => {
+            const update: PartialMessage<UpdateOrganizationSettingsRequest> = {
+                ...partialUpdate,
+            };
+            update.organizationId = organizationId;
+            update.updatePinnedEditorVersions = update.pinnedEditorVersions !== undefined;
+            update.updateRestrictedEditorNames = update.restrictedEditorNames !== undefined;
+            update.updateRoleRestrictions = update.roleRestrictions !== undefined;
+            update.updateAllowedWorkspaceClasses = update.allowedWorkspaceClasses !== undefined;
+            if (update.onboardingSettings) {
+                update.onboardingSettings.updateRecommendedRepositories =
+                    !!update.onboardingSettings.recommendedRepositories;
+                if (update.onboardingSettings.welcomeMessage) {
+                    update.onboardingSettings.welcomeMessage.featuredMemberResolvedAvatarUrl = undefined; // This field is not allowed to be set in the request.
+                }
+            }
+
+            const settings = await organizationClient.updateOrganizationSettings(update);
             return settings.settings!;
         },
         onSuccess: () => {
diff --git a/components/dashboard/src/teams/TeamPolicies.tsx b/components/dashboard/src/teams/TeamPolicies.tsx
index 051fe9e6779da2..90fdd7f0ec9fcd 100644
--- a/components/dashboard/src/teams/TeamPolicies.tsx
+++ b/components/dashboard/src/teams/TeamPolicies.tsx
@@ -55,10 +55,7 @@ export default function TeamPoliciesPage() {
                 throw new Error("no organization settings change permission");
             }
             try {
-                await updateTeamSettings.mutateAsync({
-                    ...settings,
-                    ...newSettings,
-                });
+                await updateTeamSettings.mutateAsync(newSettings);
                 setWorkspaceTimeoutSettingError(undefined);
                 toast("Organization settings updated");
             } catch (error) {
@@ -69,7 +66,7 @@ export default function TeamPoliciesPage() {
                 console.error(error);
             }
         },
-        [updateTeamSettings, org?.id, isOwner, settings, toast],
+        [updateTeamSettings, org?.id, isOwner, toast],
     );
 
     useEffect(() => {

From 5ec824caeb2e294f6f59905515abb3488b18266a Mon Sep 17 00:00:00 2001
From: Gero Posmyk-Leinemann <gero@gitpod.io>
Date: Fri, 14 Feb 2025 12:05:29 +0000
Subject: [PATCH 6/6] [dashboard, server] Fix duration handling/conversion

Tool: gitpod/catfood.gitpod.cloud
---
 .../service/json-rpc-organization-client.ts   |  2 +-
 .../dashboard/src/teams/TeamPolicies.tsx      |  4 ++--
 .../src/user-settings/Preferences.tsx         |  8 +++++---
 .../src/public-api-converter.ts               | 19 +++++++++++++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/components/dashboard/src/service/json-rpc-organization-client.ts b/components/dashboard/src/service/json-rpc-organization-client.ts
index 6c3d18675ef819..0dca7d96431252 100644
--- a/components/dashboard/src/service/json-rpc-organization-client.ts
+++ b/components/dashboard/src/service/json-rpc-organization-client.ts
@@ -273,7 +273,7 @@ export class JsonRpcOrganizationClient implements PromiseClient<typeof Organizat
             ...update,
             defaultRole: request.defaultRole as OrgMemberRole,
             timeoutSettings: {
-                inactivity: converter.toDurationString(request.timeoutSettings?.inactivity),
+                inactivity: converter.toDurationStringOpt(request.timeoutSettings?.inactivity),
                 denyUserTimeouts: request.timeoutSettings?.denyUserTimeouts,
             },
             roleRestrictions,
diff --git a/components/dashboard/src/teams/TeamPolicies.tsx b/components/dashboard/src/teams/TeamPolicies.tsx
index 90fdd7f0ec9fcd..89e7964d10fa3c 100644
--- a/components/dashboard/src/teams/TeamPolicies.tsx
+++ b/components/dashboard/src/teams/TeamPolicies.tsx
@@ -97,7 +97,7 @@ export default function TeamPoliciesPage() {
 
             handleUpdateTeamSettings({
                 timeoutSettings: {
-                    inactivity: workspaceTimeout ? converter.toDuration(workspaceTimeout) : undefined,
+                    inactivity: converter.toDurationOpt(workspaceTimeout),
                     denyUserTimeouts: !allowTimeoutChangeByMembers,
                 },
             });
@@ -182,7 +182,7 @@ export default function TeamPoliciesPage() {
                                     !isOwner ||
                                     !isPaidOrDedicated ||
                                     (workspaceTimeout ===
-                                        converter.toDurationString(settings?.timeoutSettings?.inactivity) &&
+                                        converter.toDurationStringOpt(settings?.timeoutSettings?.inactivity) &&
                                         allowTimeoutChangeByMembers === !settings?.timeoutSettings?.denyUserTimeouts)
                                 }
                             >
diff --git a/components/dashboard/src/user-settings/Preferences.tsx b/components/dashboard/src/user-settings/Preferences.tsx
index 534987e01a4b4d..8a17d36bc07778 100644
--- a/components/dashboard/src/user-settings/Preferences.tsx
+++ b/components/dashboard/src/user-settings/Preferences.tsx
@@ -39,7 +39,7 @@ export default function Preferences() {
     const [dotfileRepo, setDotfileRepo] = useState<string>(user?.dotfileRepo || "");
 
     const [workspaceTimeout, setWorkspaceTimeout] = useState<string>(
-        converter.toDurationString(user?.workspaceTimeoutSettings?.inactivity),
+        converter.toDurationStringOpt(user?.workspaceTimeoutSettings?.inactivity) || "",
     );
     const [timeoutUpdating, setTimeoutUpdating] = useState(false);
     const [creationError, setCreationError] = useState<Error>();
@@ -173,7 +173,7 @@ export default function Preferences() {
                         <Alert type="warning" className="mb-4">
                             The currently selected organization does not allow members to set custom workspace timeouts,
                             so for workspaces created in it, its default timeout of{" "}
-                            {converter.toDurationString(settings?.timeoutSettings?.inactivity)} will be used.
+                            {converter.toDurationStringOpt(settings?.timeoutSettings?.inactivity) || ""} will be used.
                         </Alert>
                     )}
 
@@ -201,7 +201,9 @@ export default function Preferences() {
                                         loading={timeoutUpdating}
                                         disabled={
                                             workspaceTimeout ===
-                                            converter.toDurationString(user?.workspaceTimeoutSettings?.inactivity)
+                                            (converter.toDurationStringOpt(
+                                                user?.workspaceTimeoutSettings?.inactivity,
+                                            ) || "")
                                         }
                                     >
                                         Save
diff --git a/components/public-api/typescript-common/src/public-api-converter.ts b/components/public-api/typescript-common/src/public-api-converter.ts
index fb90f8265f8850..89e61f4aad7554 100644
--- a/components/public-api/typescript-common/src/public-api-converter.ts
+++ b/components/public-api/typescript-common/src/public-api-converter.ts
@@ -1612,9 +1612,10 @@ export class PublicAPIConverter {
      * `Duration.nanos` is ignored
      * @returns a string like "1h2m3s", valid time units are `s`, `m`, `h`
      */
-    toDurationString(duration?: PartialMessage<Duration>): string {
-        const seconds = duration?.seconds || 0;
+    toDurationString(duration: PartialMessage<Duration>): string {
+        const seconds = duration.seconds || 0;
         if (seconds === 0) {
+            // "" is our "default value" for durations on the server side
             return "";
         }
         const totalMilliseconds = Number(seconds) * 1000;
@@ -1630,6 +1631,13 @@ export class PublicAPIConverter {
         }`;
     }
 
+    toDurationStringOpt(duration?: PartialMessage<Duration>): string | undefined {
+        if (duration === undefined) {
+            return undefined;
+        }
+        return this.toDurationString(duration);
+    }
+
     toUser(from: UserProtocol): User {
         const {
             id,
@@ -1703,6 +1711,13 @@ export class PublicAPIConverter {
         });
     }
 
+    toDurationOpt(from: string | undefined): Duration | undefined {
+        if (from === undefined) {
+            return undefined;
+        }
+        return this.toDuration(from);
+    }
+
     toWorkspaceClass(cls: SupportedWorkspaceClass): WorkspaceClass {
         return new WorkspaceClass({
             id: cls.id,