diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index fbbf04fee7f..ecfb0895868 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-19cdf695f882cf538ff87ab175d9f7b782b5ee75
+1cbd47b2d0b60cd21113a713680c6859450a2db5
diff --git a/GITLAB_ZOEKT_VERSION b/GITLAB_ZOEKT_VERSION
index 885415662ff..610e28725be 100644
--- a/GITLAB_ZOEKT_VERSION
+++ b/GITLAB_ZOEKT_VERSION
@@ -1 +1 @@
-0.21.0
+0.23.1
diff --git a/app/assets/javascripts/admin/groups/index/components/app.vue b/app/assets/javascripts/admin/groups/index/components/app.vue
index 5fd871d5bad..e280f678c99 100644
--- a/app/assets/javascripts/admin/groups/index/components/app.vue
+++ b/app/assets/javascripts/admin/groups/index/components/app.vue
@@ -6,6 +6,7 @@ import {
   TIMESTAMP_TYPE_CREATED_AT,
   TIMESTAMP_TYPE_UPDATED_AT,
 } from '~/vue_shared/components/resource_lists/constants';
+import adminGroupCountsQuery from '../graphql/queries/group_counts.query.graphql';
 import {
   ADMIN_GROUPS_TABS,
   SORT_OPTIONS,
@@ -13,6 +14,7 @@ import {
   SORT_OPTION_CREATED,
   FILTERED_SEARCH_TERM_KEY,
   FILTERED_SEARCH_NAMESPACE,
+  FIRST_TAB_ROUTE_NAMES,
 } from '../constants';
 
 export default {
@@ -22,11 +24,13 @@ export default {
   FILTERED_SEARCH_TERM_KEY,
   FILTERED_SEARCH_NAMESPACE,
   RECENT_SEARCHES_STORAGE_KEY_GROUPS,
+  FIRST_TAB_ROUTE_NAMES,
   timestampTypeMap: {
     [SORT_OPTION_CREATED.value]: TIMESTAMP_TYPE_CREATED_AT,
     [SORT_OPTION_UPDATED.value]: TIMESTAMP_TYPE_UPDATED_AT,
   },
   PAGINATION_TYPE_KEYSET,
+  tabCountsQuery: adminGroupCountsQuery,
   name: 'AdminGroupsApp',
   components: { TabsWithList },
 };
@@ -44,5 +48,8 @@ export default {
     :timestamp-type-map="$options.timestampTypeMap"
     initial-sort=""
     :pagination-type="$options.PAGINATION_TYPE_KEYSET"
+    :tab-counts-query="$options.tabCountsQuery"
+    :tab-counts-query-error-message="__('An error occurred loading the group counts.')"
+    :first-tab-route-names="$options.FIRST_TAB_ROUTE_NAMES"
   />
 </template>
diff --git a/app/assets/javascripts/admin/groups/index/constants.js b/app/assets/javascripts/admin/groups/index/constants.js
index ea66059a806..166d92cd1c9 100644
--- a/app/assets/javascripts/admin/groups/index/constants.js
+++ b/app/assets/javascripts/admin/groups/index/constants.js
@@ -33,6 +33,7 @@ export const ACTIVE_TAB = {
   text: __('Active'),
   value: 'active',
   variables: { active: true },
+  countsQueryPath: 'active',
 };
 
 export const INACTIVE_TAB = {
@@ -40,6 +41,7 @@ export const INACTIVE_TAB = {
   text: __('Inactive'),
   value: 'inactive',
   variables: { active: false },
+  countsQueryPath: 'inactive',
 };
 
 export const SORT_OPTION_NAME = {
@@ -75,5 +77,7 @@ export const BASE_ROUTE = '/admin/groups';
 
 export const ADMIN_GROUPS_ROUTE_NAME = 'admin-groups';
 
+export const FIRST_TAB_ROUTE_NAMES = [ADMIN_GROUPS_ROUTE_NAME];
+
 export const FILTERED_SEARCH_TERM_KEY = 'search';
 export const FILTERED_SEARCH_NAMESPACE = 'admin-groups';
diff --git a/app/assets/javascripts/admin/groups/index/graphql/queries/group_counts.query.graphql b/app/assets/javascripts/admin/groups/index/graphql/queries/group_counts.query.graphql
new file mode 100644
index 00000000000..f8c8e831aea
--- /dev/null
+++ b/app/assets/javascripts/admin/groups/index/graphql/queries/group_counts.query.graphql
@@ -0,0 +1,10 @@
+# Since GraphQL doesn't support string comparison in @skip(if:)
+# we use the naming convention of skip${tabValue} in camelCase
+query adminGroupCountsQuery($skipActive: Boolean = false, $skipInactive: Boolean = false) {
+  active: groups(allAvailable: true, active: true) @skip(if: $skipActive) {
+    count
+  }
+  inactive: groups(allAvailable: true, active: false) @skip(if: $skipInactive) {
+    count
+  }
+}
diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue
index f1ef83b6754..34a5331a61a 100644
--- a/app/assets/javascripts/boards/components/board_list.vue
+++ b/app/assets/javascripts/boards/components/board_list.vue
@@ -685,7 +685,10 @@ export default {
         });
       } finally {
         this.addItemToListInProgress = false;
-        this.setActiveWorkItem(issuable);
+        // Only open the drawer if issue creation was successful (default iid of '-1' indicates failure)
+        if (issuable && issuable?.iid !== '-1') {
+          this.setActiveWorkItem(issuable);
+        }
       }
     },
     setActiveWorkItem(boardItem) {
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_agent_info.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_agent_info.vue
index 638615f1e4e..a14d904d039 100644
--- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_agent_info.vue
+++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_agent_info.vue
@@ -1,10 +1,10 @@
 <script>
-import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlIcon, GlLink, GlSprintf, GlButton, GlModalDirective } from '@gitlab/ui';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import ConnectToAgentModal from '~/clusters_list/components/connect_to_agent_modal.vue';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { getAgentLastContact, getAgentStatus } from '~/clusters_list/clusters_util';
-import { AGENT_STATUSES } from '~/clusters_list/constants';
-import { s__ } from '~/locale';
+import { AGENT_STATUSES, CONNECT_MODAL_ID } from '~/clusters_list/constants';
 
 export default {
   components: {
@@ -12,6 +12,11 @@ export default {
     GlLink,
     GlSprintf,
     TimeAgoTooltip,
+    GlButton,
+    ConnectToAgentModal,
+  },
+  directives: {
+    GlModalDirective,
   },
   props: {
     clusterAgent: {
@@ -29,32 +34,48 @@ export default {
     agentId() {
       return getIdFromGraphQLId(this.clusterAgent.id);
     },
-  },
-  methods: {},
-  i18n: {
-    agentId: s__('ClusterAgents|Agent ID #%{agentId}'),
+    agentProjectPath() {
+      return this.clusterAgent.project?.fullPath || '';
+    },
   },
   AGENT_STATUSES,
+  CONNECT_MODAL_ID,
 };
 </script>
 <template>
-  <div class="gl-text-default">
-    <gl-icon name="kubernetes-agent" variant="subtle" />
-    <gl-link :href="clusterAgent.webPath" class="gl-mr-3">
-      <gl-sprintf :message="$options.i18n.agentId"
-        ><template #agentId>{{ agentId }}</template></gl-sprintf
-      >
-    </gl-link>
-    <span data-testid="agent-status">
-      <gl-icon
-        :name="$options.AGENT_STATUSES[agentStatus].icon"
-        :class="$options.AGENT_STATUSES[agentStatus].class"
-      />
-      {{ $options.AGENT_STATUSES[agentStatus].name }}
-    </span>
+  <div>
+    <div class="gl-mb-4 gl-mt-2 gl-text-default">
+      <gl-icon name="kubernetes-agent" variant="subtle" />
+      <gl-link :href="clusterAgent.webPath" class="gl-mr-3">
+        <gl-sprintf :message="s__('ClusterAgents|Agent ID #%{agentId}')"
+          ><template #agentId>{{ agentId }}</template></gl-sprintf
+        >
+      </gl-link>
+      <span data-testid="agent-status">
+        <gl-icon
+          :name="$options.AGENT_STATUSES[agentStatus].icon"
+          :class="$options.AGENT_STATUSES[agentStatus].class"
+        />
+        {{ $options.AGENT_STATUSES[agentStatus].name }}
+      </span>
 
-    <span data-testid="agent-last-used-date">
-      <time-ago-tooltip v-if="agentLastContact" :time="agentLastContact" />
-    </span>
+      <span data-testid="agent-last-used-date">
+        <time-ago-tooltip v-if="agentLastContact" :time="agentLastContact" />
+      </span>
+    </div>
+
+    <gl-button
+      v-gl-modal-directive="$options.CONNECT_MODAL_ID"
+      category="secondary"
+      variant="confirm"
+      class="gl-mb-2"
+      >{{ s__('ClusterAgents|Connect to agent') }}</gl-button
+    >
+
+    <connect-to-agent-modal
+      :agent-id="clusterAgent.id"
+      :project-path="agentProjectPath"
+      :is-configured="true"
+    />
   </div>
 </template>
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue
index 10c23c48a49..e9c0274d678 100644
--- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue
+++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue
@@ -1,13 +1,5 @@
 <script>
-import {
-  GlEmptyState,
-  GlSprintf,
-  GlLink,
-  GlAlert,
-  GlDisclosureDropdown,
-  GlDisclosureDropdownItem,
-  GlModalDirective,
-} from '@gitlab/ui';
+import { GlEmptyState, GlSprintf, GlLink, GlAlert } from '@gitlab/ui';
 import CLUSTER_EMPTY_SVG from '@gitlab/svgs/dist/illustrations/empty-state/empty-environment-md.svg';
 import { isEmpty } from 'lodash';
 import { s__, __ } from '~/locale';
@@ -31,9 +23,7 @@ import {
   FLUX_SUSPEND_ACTION,
   FLUX_RESUME_ACTION,
 } from '~/environments/constants';
-import { CONNECT_MODAL_ID } from '~/clusters_list/constants';
 import WorkloadDetailsDrawer from '~/kubernetes_dashboard/components/workload_details_drawer.vue';
-import ConnectToAgentModal from '~/clusters_list/components/connect_to_agent_modal.vue';
 import updateFluxResourceMutation from '~/environments/graphql/mutations/update_flux_resource.mutation.graphql';
 import KubernetesStatusBar from './kubernetes_status_bar.vue';
 import KubernetesAgentInfo from './kubernetes_agent_info.vue';
@@ -52,13 +42,7 @@ export default {
     GlSprintf,
     GlLink,
     GlAlert,
-    GlDisclosureDropdown,
-    GlDisclosureDropdownItem,
     DeletePodModal,
-    ConnectToAgentModal,
-  },
-  directives: {
-    GlModalDirective,
   },
   mixins: [trackingMixin],
   inject: ['kasTunnelUrl'],
@@ -161,9 +145,6 @@ export default {
         this.fluxKustomization?.metadata?.namespace || this.fluxHelmRelease?.metadata?.namespace
       );
     },
-    agentProjectPath() {
-      return this.clusterAgent.project?.fullPath || '';
-    },
   },
   methods: {
     handleError(message) {
@@ -276,12 +257,11 @@ export default {
   learnMoreLink: helpPagePath('user/clusters/agent/_index'),
   getStartedLink: helpPagePath('ci/environments/kubernetes_dashboard'),
   CLUSTER_EMPTY_SVG,
-  CONNECT_MODAL_ID,
 };
 </script>
 <template>
   <div v-if="clusterAgent" class="-gl-mt-3 gl-bg-subtle gl-p-5">
-    <div class="gl-flex gl-flex-wrap gl-items-center gl-justify-between">
+    <div class="gl-flex gl-flex-wrap gl-items-start gl-justify-between">
       <kubernetes-agent-info :cluster-agent="clusterAgent" class="gl-mb-2 gl-mr-5 gl-grow" />
       <kubernetes-status-bar
         ref="status_bar"
@@ -297,26 +277,6 @@ export default {
         @error="handleError"
         @show-flux-resource-details="showFluxResourceDetails"
       />
-
-      <gl-disclosure-dropdown
-        :title="$options.i18n.actions"
-        category="tertiary"
-        icon="ellipsis_v"
-        text-sr-only
-        no-caret
-      >
-        <gl-disclosure-dropdown-item v-gl-modal-directive="$options.CONNECT_MODAL_ID">
-          <template #list-item>
-            {{ $options.i18n.connectButtonText }}
-          </template>
-        </gl-disclosure-dropdown-item>
-      </gl-disclosure-dropdown>
-
-      <connect-to-agent-modal
-        :agent-id="clusterAgent.id"
-        :project-path="agentProjectPath"
-        :is-configured="true"
-      />
     </div>
 
     <gl-alert v-if="error" variant="danger" :dismissible="false" class="gl-my-5">
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/pod_logs_button.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/pod_logs_button.vue
index 2e9ee9f6fd1..d850e5f84fb 100644
--- a/app/assets/javascripts/environments/environment_details/components/kubernetes/pod_logs_button.vue
+++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/pod_logs_button.vue
@@ -59,7 +59,10 @@ export default {
     :toggle-text="$options.i18n.buttonText"
     :items="containersList"
     size="small"
+    icon="log"
   />
 
-  <gl-button v-else :to="getLogsLink()" size="small">{{ $options.i18n.buttonText }}</gl-button>
+  <gl-button v-else :to="getLogsLink()" size="small" icon="log">{{
+    $options.i18n.buttonText
+  }}</gl-button>
 </template>
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index 08f28fc465a..30dfc2159e3 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -246,14 +246,6 @@ export default {
       return this.filter.length > 0 && !this.hasGroups;
     },
 
-    statusMessage() {
-      return this.filter.length === 0
-        ? s__('BulkImport|Showing %{start}-%{end} of %{total} that you own from %{link}')
-        : s__(
-            'BulkImport|Showing %{start}-%{end} of %{total} that you own matching filter "%{filter}" from %{link}',
-          );
-    },
-
     paginationInfo() {
       const { page, perPage, total } = this.bulkImportSourceGroups?.pageInfo ?? {
         page: 1,
@@ -679,18 +671,21 @@ export default {
         </gl-button>
       </template>
       <template #description>
-        {{ s__('BulkImport|Select the groups and projects you want to import.') }}
         <gl-sprintf
           :message="
-            s__('BulkImport|Importing projects is a %{docsLinkStart}beta%{docsLinkEnd} feature.')
+            s__(
+              'BulkImport|Only groups that you have the %{role} role for from %{source} are listed for import.',
+            )
           "
         >
-          <template #docsLink="{ content }"
-            ><gl-link :href="$options.betaFeatureHelpPath" target="_blank">{{
-              content
-            }}</gl-link></template
-          >
+          <template #role>
+            <gl-link :href="$options.permissionsHelpPath" target="_blank">{{
+              $options.i18n.OWNER
+            }}</gl-link>
+          </template>
+          <template #source>{{ sourceUrl }}</template>
         </gl-sprintf>
+        {{ s__('BulkImport|Select the groups you want to import.') }}
       </template>
     </page-heading>
 
@@ -745,41 +740,9 @@ export default {
         </template>
       </gl-sprintf>
     </gl-alert>
-    <div class="gl-border-0 gl-border-b-1 gl-border-solid gl-border-b-default gl-py-5">
-      <span v-if="!$apollo.loading && hasGroups">
-        <gl-sprintf :message="statusMessage">
-          <template #start>
-            <strong>{{ paginationInfo.start }}</strong>
-          </template>
-          <template #end>
-            <strong>{{ paginationInfo.end }}</strong>
-          </template>
-          <template #total>
-            <strong>{{ groupsCount(paginationInfo.total) }}</strong>
-          </template>
-          <template #filter>
-            <strong>{{ filter }}</strong>
-          </template>
-          <template #link>
-            {{ sourceUrl }}
-          </template>
-        </gl-sprintf>
-        <help-popover :options="$options.popoverOptions">
-          <gl-sprintf
-            :message="
-              s__('BulkImport|Only groups you have the %{role} role for are listed for import.')
-            "
-          >
-            <template #role>
-              <gl-link class="gl-text-sm" :href="$options.permissionsHelpPath" target="_blank">{{
-                $options.i18n.OWNER
-              }}</gl-link>
-            </template>
-          </gl-sprintf>
-        </help-popover>
-      </span>
-    </div>
-    <div class="gl-flex gl-flex-col gl-gap-3 gl-bg-subtle gl-p-5 gl-pb-4">
+    <div
+      class="gl-flex gl-flex-col gl-gap-3 gl-border-t-1 gl-border-t-default gl-bg-subtle gl-p-5 gl-pb-4 gl-border-t-solid"
+    >
       <gl-search-box-by-click
         data-testid="filter-groups"
         :placeholder="s__('BulkImport|Filter by source group')"
diff --git a/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue b/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue
index 14f46527181..c51a280bbac 100644
--- a/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue
+++ b/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue
@@ -1,12 +1,5 @@
 <script>
-import {
-  GlTable,
-  GlBadge,
-  GlPagination,
-  GlDisclosureDropdown,
-  GlButton,
-  GlTooltipDirective,
-} from '@gitlab/ui';
+import { GlTable, GlBadge, GlPagination, GlButton, GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 import PodLogsButton from '~/environments/environment_details/components/kubernetes/pod_logs_button.vue';
 import {
@@ -21,7 +14,6 @@ export default {
     GlBadge,
     GlPagination,
     PodLogsButton,
-    GlDisclosureDropdown,
     GlButton,
   },
   directives: {
@@ -69,22 +61,14 @@ export default {
       this.selectedItem = item;
       this.$emit('select-item', item);
     },
-    getActions(item) {
+    getDeleteAction(item) {
       const actions = item.actions || [];
-      return actions.map((action) => {
-        return {
-          text: action.text,
-          extraAttrs: { class: action.class },
-          action: () => {
-            this.$emit(action.name, item);
-          },
-        };
-      });
+
+      return actions.find((action) => action.name === 'delete-pod') || null;
     },
   },
   i18n: {
     emptyText: __('No results found'),
-    actions: __('Actions'),
   },
   WORKLOAD_STATUS_BADGE_VARIANTS,
 };
@@ -100,17 +84,22 @@ export default {
       :empty-text="$options.i18n.emptyText"
       primary-key="name"
       show-empty
-      stacked="md"
+      stacked="lg"
     >
       <template #cell(name)="{ item }">
-        <gl-button variant="link" @click="selectItem(item)">{{ item.name }}</gl-button>
+        <gl-button
+          :title="item.name"
+          class="gl-max-w-full gl-truncate"
+          variant="link"
+          @click="selectItem(item)"
+          >{{ item.name }}</gl-button
+        >
       </template>
 
       <template #cell(status)="{ item: { status, statusText, statusTooltip } }">
         <gl-badge
           v-gl-tooltip
           :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[status]"
-          class="gl-ml-2"
           :title="statusTooltip"
           :tabindex="statusTooltip ? '0' : undefined"
         >
@@ -118,25 +107,25 @@ export default {
         </gl-badge>
       </template>
 
-      <template #cell(logs)="{ item: { name, namespace, containers } }">
-        <pod-logs-button
-          v-if="containers"
-          :namespace="namespace"
-          :pod-name="name"
-          :containers="containers"
-        />
-      </template>
-
       <template #cell(actions)="{ item }">
-        <gl-disclosure-dropdown
-          v-if="item.actions"
-          :title="$options.i18n.actions"
-          :items="getActions(item)"
-          text-sr-only
-          category="tertiary"
-          no-caret
-          icon="ellipsis_v"
-        />
+        <div class="gl-flex gl-items-center gl-justify-end gl-gap-4 lg:gl-justify-between">
+          <pod-logs-button
+            v-if="item.containers"
+            :namespace="item.namespace"
+            :pod-name="item.name"
+            :containers="item.containers"
+          />
+          <gl-button
+            v-if="getDeleteAction(item)"
+            icon="remove"
+            size="small"
+            variant="danger"
+            category="tertiary"
+            data-testid="delete-action-button"
+            :aria-label="getDeleteAction(item).text"
+            @click="$emit(getDeleteAction(item).name, item)"
+          />
+        </div>
       </template>
     </gl-table>
 
diff --git a/app/assets/javascripts/kubernetes_dashboard/constants.js b/app/assets/javascripts/kubernetes_dashboard/constants.js
index c02a6ddb72a..bd866410909 100644
--- a/app/assets/javascripts/kubernetes_dashboard/constants.js
+++ b/app/assets/javascripts/kubernetes_dashboard/constants.js
@@ -73,30 +73,25 @@ export const PODS_TABLE_FIELDS = [
   {
     key: 'name',
     label: s__('KubernetesDashboard|Name'),
-    tdClass: 'md:gl-w-1/4 gl-break-anywhere',
+    tdClass: 'lg:gl-w-1/4 gl-break-anywhere',
   },
   {
     key: 'status',
     label: s__('KubernetesDashboard|Status'),
-    tdClass: 'md:gl-w-1/6',
+    tdClass: 'lg:gl-w-1/6',
   },
   {
     key: 'namespace',
     label: s__('KubernetesDashboard|Namespace'),
-    tdClass: 'md:gl-w-1/4 gl-break-anywhere',
+    tdClass: 'lg:gl-w-1/4 gl-break-anywhere',
   },
   {
     key: 'age',
     label: s__('KubernetesDashboard|Age'),
   },
-  {
-    key: 'logs',
-    label: s__('KubernetesDashboard|Logs'),
-    sortable: false,
-  },
   {
     key: 'actions',
-    label: '',
+    label: s__('KubernetesDashboard|Actions'),
     sortable: false,
   },
 ];
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index 9e277fbc8bd..b8153a60ff1 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -156,20 +156,21 @@ export default {
         data-testid="author-name"
         v-text="authorName"
       ></span>
-      <a
-        v-else
-        ref="authorNameLink"
-        :href="authorHref"
-        :class="authorLinkClasses"
-        :data-user-id="authorId"
-        :data-username="author.username"
-      >
-        <span
-          class="note-header-author-name gl-font-bold"
-          data-testid="author-name"
-          v-text="authorName"
-        ></span>
-      </a>
+      <span v-else>
+        <a
+          ref="authorNameLink"
+          :href="authorHref"
+          :class="authorLinkClasses"
+          :data-user-id="authorId"
+          :data-username="author.username"
+        >
+          <span
+            class="note-header-author-name gl-font-bold"
+            data-testid="author-name"
+            v-text="authorName"
+          ></span>
+        </a>
+      </span>
       <span
         v-if="!isSystemNote && !emailParticipant"
         class="text-nowrap author-username -gl-m-2 gl-mr-0 gl-hidden gl-truncate gl-p-2 md:gl-inline"
diff --git a/app/assets/javascripts/projects/upload_file.js b/app/assets/javascripts/projects/upload_file.js
index 794bf1dfd65..6300c1d84dd 100644
--- a/app/assets/javascripts/projects/upload_file.js
+++ b/app/assets/javascripts/projects/upload_file.js
@@ -8,12 +8,19 @@ export const initUploadFileTrigger = () => {
 
   if (!uploadFileTriggerEl) return false;
 
-  const { targetBranch, originalBranch, canPushCode, canPushToBranch, path, projectPath } =
-    uploadFileTriggerEl.dataset;
+  const {
+    targetBranch,
+    originalBranch,
+    canPushCode,
+    canPushToBranch,
+    path,
+    projectPath,
+    fullName,
+  } = uploadFileTriggerEl.dataset;
 
   return new Vue({
     el: uploadFileTriggerEl,
-    router: createRouter(projectPath, originalBranch),
+    router: createRouter(projectPath, originalBranch, fullName),
     provide: {
       targetBranch,
       originalBranch,
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue
index 7c4e9f0e488..b5f3c2ed87b 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue
@@ -1,4 +1,5 @@
 <script>
+import { uniqueId } from 'lodash';
 import { GlTooltipDirective, GlLink } from '@gitlab/ui';
 import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
 import { isGid, getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -23,6 +24,11 @@ export default {
       required: false,
     },
   },
+  data() {
+    return {
+      userPopoverId: uniqueId('user-popover-'),
+    };
+  },
   computed: {
     isMergeRequest() {
       return this.issuableType === TYPE_MERGE_REQUEST;
@@ -43,18 +49,20 @@ export default {
 
 <template>
   <!-- must be `gl-inline-block` or parent flex-basis causes width issues -->
-  <gl-link
-    :href="assigneeUrl"
-    :data-user-id="assigneeId"
-    :data-username="user.username"
-    :data-cannot-merge="cannotMerge"
-    data-placement="left"
-    class="js-user-link gl-inline-block"
-  >
-    <!-- use gl-flex so that slot can be appropriately styled -->
-    <span class="gl-flex">
-      <assignee-avatar :user="user" :img-size="24" :issuable-type="issuableType" />
-      <slot></slot>
-    </span>
-  </gl-link>
+  <span :id="userPopoverId" class="gl-inline-block">
+    <gl-link
+      :href="assigneeUrl"
+      :data-user-id="assigneeId"
+      :data-username="user.username"
+      :data-cannot-merge="cannotMerge"
+      data-placement="left"
+      class="js-user-link"
+    >
+      <!-- use gl-flex so that slot can be appropriately styled -->
+      <span class="gl-flex">
+        <assignee-avatar :user="user" :img-size="24" :issuable-type="issuableType" />
+        <slot></slot>
+      </span>
+    </gl-link>
+  </span>
 </template>
diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue
index 969c05be2ee..e3a396905dd 100644
--- a/app/assets/javascripts/sidebar/components/participants/participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/participants.vue
@@ -1,5 +1,6 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
+import { uniqueId } from 'lodash';
 import { GlButton, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { __, n__, sprintf } from '~/locale';
@@ -85,6 +86,9 @@ export default {
     getParticipantId(participantId) {
       return getIdFromGraphQLId(participantId);
     },
+    userPopoverId() {
+      return uniqueId('user-popover-');
+    },
   },
 };
 </script>
@@ -99,23 +103,24 @@ export default {
       <gl-loading-icon v-if="loading" inline />
     </div>
     <div class="gl-flex gl-flex-wrap gl-gap-3">
-      <a
-        v-for="participant in visibleParticipants"
-        :key="participant.id"
-        :href="participant.web_url || participant.webUrl"
-        :data-user-id="getParticipantId(participant.id)"
-        :data-username="participant.username"
-        class="author-link js-user-link gl-inline-block gl-rounded-full"
-      >
-        <user-avatar-image
-          :lazy="lazy"
-          :img-src="participant.avatar_url || participant.avatarUrl"
-          :size="24"
-          :img-alt="participant.name"
-          css-classes="!gl-mr-0"
-          tooltip-placement="bottom"
-        />
-      </a>
+      <span v-for="participant in visibleParticipants" :id="userPopoverId()" :key="participant.id">
+        <a
+          :key="participant.id"
+          :href="participant.web_url || participant.webUrl"
+          :data-user-id="getParticipantId(participant.id)"
+          :data-username="participant.username"
+          class="author-link js-user-link gl-inline-block gl-rounded-full"
+        >
+          <user-avatar-image
+            :lazy="lazy"
+            :img-src="participant.avatar_url || participant.avatarUrl"
+            :size="24"
+            :img-alt="participant.name"
+            css-classes="!gl-mr-0"
+            tooltip-placement="bottom"
+          />
+        </a>
+      </span>
     </div>
     <gl-button
       v-if="hasMoreParticipants"
diff --git a/app/assets/javascripts/user_popovers.js b/app/assets/javascripts/user_popovers.js
index b9dcb097c84..c0ffb9f0ee2 100644
--- a/app/assets/javascripts/user_popovers.js
+++ b/app/assets/javascripts/user_popovers.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { debounce } from 'lodash';
+import { uniqueId, debounce } from 'lodash';
 import UsersCache from './lib/utils/users_cache';
 import UserPopover from './vue_shared/components/user_popover/user_popover.vue';
 import { USER_POPOVER_DELAY } from './vue_shared/components/user_popover/constants';
@@ -67,6 +67,10 @@ function createPopover(el, user) {
   removeTitle(el);
   const preloadedUserInfo = getPreloadedUserInfo(el.dataset);
 
+  if (!el.parentNode.id) {
+    el.parentNode.id = uniqueId('user-popover-');
+  }
+
   Object.assign(user, preloadedUserInfo);
 
   if (preloadedUserInfo.userId) {
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index da522633263..7716a3e5efe 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -208,7 +208,6 @@ export default {
     :delay="$options.USER_POPOVER_DELAY"
     :placement="placement"
     :container="container"
-    boundary="viewport"
     triggers="hover focus manual"
     data-testid="user-popover"
   >
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_note.vue
index 31315434134..1e0c13300a3 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_note.vue
@@ -1,5 +1,5 @@
 <script>
-import { isEmpty } from 'lodash';
+import { uniqueId, isEmpty } from 'lodash';
 import { GlAvatarLink, GlAvatar } from '@gitlab/ui';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import toast from '~/vue_shared/plugins/global_toast';
@@ -129,6 +129,7 @@ export default {
   },
   data() {
     return {
+      userPopoverId: uniqueId('user-popover-'),
       isEditing: false,
       isUpdating: false,
       workItem: {},
@@ -368,19 +369,21 @@ export default {
 <template>
   <timeline-entry-item :id="noteAnchorId" :class="entryClass">
     <div :key="note.id" class="timeline-avatar gl-float-left">
-      <gl-avatar-link
-        :href="author.webUrl"
-        :data-user-id="authorId"
-        :data-username="author.username"
-        class="js-user-link"
-      >
-        <gl-avatar
-          :src="author.avatarUrl"
-          :entity-name="author.username"
-          :alt="author.name"
-          :size="32"
-        />
-      </gl-avatar-link>
+      <span :id="userPopoverId" class="gl-relative">
+        <gl-avatar-link
+          :href="author.webUrl"
+          :data-user-id="authorId"
+          :data-username="author.username"
+          class="js-user-link"
+        >
+          <gl-avatar
+            :src="author.avatarUrl"
+            :entity-name="author.username"
+            :alt="author.name"
+            :size="32"
+          />
+        </gl-avatar-link>
+      </span>
     </div>
     <div class="timeline-content">
       <div data-testid="note-wrapper">
diff --git a/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue b/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue
index 7fac4e3a0f3..1f05dc1f0cb 100644
--- a/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue
+++ b/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue
@@ -162,9 +162,6 @@ export default {
       });
       return selectOptions;
     },
-    workItemEpicMilestonesEnabled() {
-      return this.glFeatures.workItemEpicMilestones;
-    },
     isSelectedWorkItemTypeEpic() {
       return this.selectedWorkItemType?.name === WORK_ITEM_TYPE_NAME_EPIC;
     },
@@ -227,11 +224,7 @@ export default {
     widgetsWithExistingData() {
       return this.widgetsWithExistingDataList.reduce((widgets, item) => {
         // Skip adding milestone to widget difference if upgrading to epic
-        if (
-          this.workItemEpicMilestonesEnabled &&
-          this.isSelectedWorkItemTypeEpic &&
-          item.type === WIDGET_TYPE_MILESTONE
-        ) {
+        if (this.isSelectedWorkItemTypeEpic && item.type === WIDGET_TYPE_MILESTONE) {
           return widgets;
         }
         widgets.push({
@@ -244,7 +237,6 @@ export default {
     noValuePresentWidgets() {
       return this.widgetsWithExistingDataList.reduce((acc, item) => {
         if (
-          this.workItemEpicMilestonesEnabled &&
           this.isSelectedWorkItemTypeEpic &&
           this.milestoneWidget?.projectMilestone &&
           item.type === WIDGET_TYPE_MILESTONE
diff --git a/app/assets/javascripts/work_items/components/work_item_created_updated.vue b/app/assets/javascripts/work_items/components/work_item_created_updated.vue
index bb8c4c6ee33..9883e5be9db 100644
--- a/app/assets/javascripts/work_items/components/work_item_created_updated.vue
+++ b/app/assets/javascripts/work_items/components/work_item_created_updated.vue
@@ -1,4 +1,5 @@
 <script>
+import { uniqueId } from 'lodash';
 import { GlAvatarLink, GlSprintf, GlLoadingIcon } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import HiddenBadge from '~/issuable/components/hidden_badge.vue';
@@ -39,6 +40,7 @@ export default {
   data() {
     return {
       workItem: {},
+      userPopoverId: uniqueId('user-popover-'),
     };
   },
   computed: {
@@ -126,7 +128,7 @@ export default {
       show-text
       icon-class="gl-fill-icon-subtle"
     />
-    <span data-testid="work-item-created" class="gl-align-middle">
+    <span :id="userPopoverId" data-testid="work-item-created" class="gl-align-middle">
       <gl-sprintf v-if="author.name" :message="__('created %{timeAgo} by %{author}')">
         <template #timeAgo>
           <time-ago-tooltip :time="createdAt" />
diff --git a/app/assets/javascripts/work_items/pages/work_items_list_app.vue b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
index f19dc6abe11..ac786764996 100644
--- a/app/assets/javascripts/work_items/pages/work_items_list_app.vue
+++ b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
@@ -594,9 +594,7 @@ export default {
         hasManualSort: false,
         hasStartDate: true,
         hasPriority: !this.isEpicsList,
-        hasMilestoneDueDate: Boolean(
-          !this.isEpicsList || (this.isEpicsList && this.glFeatures.workItemEpicMilestones),
-        ),
+        hasMilestoneDueDate: true,
         hasLabelPriority: !this.isEpicsList,
         hasWeight: !this.isEpicsList,
       });
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 844405ba285..9855ce49864 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -6,10 +6,6 @@ class Groups::MilestonesController < Groups::ApplicationController
   before_action :milestone, only: [:edit, :show, :update, :issues, :merge_requests, :participants, :labels, :destroy]
   before_action :authorize_admin_milestones!, only: [:edit, :new, :create, :update, :destroy]
 
-  before_action do
-    push_force_frontend_feature_flag(:work_item_epic_milestones, !!@group.work_item_epic_milestones_feature_flag_enabled?)
-  end
-
   feature_category :team_planning
   urgency :low
 
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index a0ffeb8734c..8121502b7d3 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -19,10 +19,6 @@ class Projects::MilestonesController < Projects::ApplicationController
   # Allow to promote milestone
   before_action :authorize_promote_milestone!, only: :promote
 
-  before_action do
-    push_force_frontend_feature_flag(:work_item_epic_milestones, !!@project&.work_item_epic_milestones_feature_flag_enabled?)
-  end
-
   respond_to :html
 
   feature_category :team_planning
diff --git a/app/helpers/timeboxes_helper.rb b/app/helpers/timeboxes_helper.rb
index 5e5b70afc95..bffd4f0e15f 100644
--- a/app/helpers/timeboxes_helper.rb
+++ b/app/helpers/timeboxes_helper.rb
@@ -295,13 +295,8 @@ module TimeboxesHelper
     limit = Milestone::DISPLAY_ISSUES_LIMIT
     link_options = { milestone_title: @milestone.title }
 
-    if @project.work_item_epic_milestones_feature_flag_enabled?
-      message = _('Showing %{limit} of %{total_count} items. ') % { limit: limit, total_count: total_count }
-      message += link_to(_('View all'), milestones_issues_path(link_options))
-    else
-      message = _('Showing %{limit} of %{total_count} issues. ') % { limit: limit, total_count: total_count }
-      message += link_to(_('View all issues'), milestones_issues_path(link_options))
-    end
+    message = _('Showing %{limit} of %{total_count} items. ') % { limit: limit, total_count: total_count }
+    message += link_to(_('View all'), milestones_issues_path(link_options))
 
     message.html_safe
   end
diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb
index 3916cbe9bf9..68f18077254 100644
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
@@ -65,9 +65,7 @@ module Milestoneish
     work_items_finder_params = issues_finder_params
     work_items_finder_params[:include_descendants] = true if work_items_finder_params[:include_subgroups]
 
-    container = project || group
-    work_items_finder_params[:issue_types] =
-      container.work_item_epic_milestones_feature_flag_enabled? ? %w[issue epic task] : %w[issue task]
+    work_items_finder_params[:issue_types] = %w[issue epic task]
 
     work_item_ids = ::WorkItems::WorkItemsFinder.new(user, work_items_finder_params)
     .execute.preload_associated_models
diff --git a/app/models/group.rb b/app/models/group.rb
index 2cbc9124d1d..cbffc3cbe37 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1101,10 +1101,6 @@ class Group < Namespace
     feature_flag_enabled_for_self_or_ancestor?(:work_items_alpha)
   end
 
-  def work_item_epic_milestones_feature_flag_enabled?
-    ::Feature.enabled?(:work_item_epic_milestones, root_ancestor, type: :beta)
-  end
-
   def work_item_status_feature_available?
     feature_flag_enabled_for_self_or_ancestor?(:work_item_status_feature_flag, type: :wip) &&
       licensed_feature_available?(:work_item_status)
diff --git a/app/models/project.rb b/app/models/project.rb
index 28c5d99bfa0..4e6b51bbf76 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -3449,10 +3449,6 @@ class Project < ApplicationRecord
     group&.work_items_alpha_feature_flag_enabled? || Feature.enabled?(:work_items_alpha)
   end
 
-  def work_item_epic_milestones_feature_flag_enabled?
-    ::Feature.enabled?(:work_item_epic_milestones, root_ancestor, type: :beta)
-  end
-
   def work_item_status_feature_available?
     (group&.work_item_status_feature_available? || Feature.enabled?(:work_item_status_feature_flag, type: :wip)) &&
       licensed_feature_available?(:work_item_status)
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 665d0fb4721..07c4eadb820 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -264,7 +264,8 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
           'can_push_code' => 'true',
           'can_push_to_branch' => 'true',
           'path' => project_create_blob_path(project, default_branch_or_main),
-          'project_path' => project.full_path
+          'project_path' => project.full_path,
+          'full_name' => project.name_with_namespace
         }
       )
     end
diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml
index 0a03594ba25..08aef3b6737 100644
--- a/app/views/shared/milestones/_issuables.html.haml
+++ b/app/views/shared/milestones/_issuables.html.haml
@@ -6,9 +6,8 @@
     .gl-grow-2
       .gl-flex.gl-flex-col.gl-text-default
         = title
-        - if @group&.work_item_epic_milestones_feature_flag_enabled?
-          .gl-text-subtle.gl-text-sm
-            = subtitle
+        .gl-text-subtle.gl-text-sm
+          = subtitle
     .gl-ml-3.gl-shrink-0.gl-font-bold.gl-whitespace-nowrap.gl-text-subtle
       - if show_counter
         %span
diff --git a/app/views/shared/milestones/_issues_tab.html.haml b/app/views/shared/milestones/_issues_tab.html.haml
index 046bb23f761..7c789728003 100644
--- a/app/views/shared/milestones/_issues_tab.html.haml
+++ b/app/views/shared/milestones/_issues_tab.html.haml
@@ -7,19 +7,10 @@
       - c.with_body do
         = milestone_issues_count_message(@milestone)
 
-- if @group&.work_item_epic_milestones_feature_flag_enabled?
-  .row.gl-mt-3
-    .col-md-4
-      = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Unstarted'), subtitle: _('(open and unassigned)'), issuables: issues.opened.unassigned, id: 'unassigned', show_counter: true)
-    .col-md-4
-      = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Ongoing'), subtitle: _('(open and unassigned)'), issuables: issues.opened.assigned, id: 'ongoing', show_counter: true)
-    .col-md-4
-      = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Completed'), subtitle: _('(closed)'), issuables: issues.closed, id: 'closed', show_counter: true)
-- else
-  .row.gl-mt-3
-    .col-md-4
-      = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Unstarted Issues (open and unassigned)'), issuables: issues.opened.unassigned, id: 'unassigned', show_counter: true)
-    .col-md-4
-      = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Ongoing Issues (open and assigned)'), issuables: issues.opened.assigned, id: 'ongoing', show_counter: true)
-    .col-md-4
-      = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Completed Issues (closed)'), issuables: issues.closed, id: 'closed', show_counter: true)
+.row.gl-mt-3
+  .col-md-4
+    = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Unstarted'), subtitle: _('(open and unassigned)'), issuables: issues.opened.unassigned, id: 'unassigned', show_counter: true)
+  .col-md-4
+    = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Ongoing'), subtitle: _('(open and unassigned)'), issuables: issues.opened.assigned, id: 'ongoing', show_counter: true)
+  .col-md-4
+    = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Completed'), subtitle: _('(closed)'), issuables: issues.closed, id: 'closed', show_counter: true)
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml
index d677f29cdac..a1877acc6c4 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -1,6 +1,5 @@
 - affix_offset = local_assigns.fetch(:affix_offset, "50")
 - project = local_assigns[:project]
-- milestones_on_epics_enabled = @group&.work_item_epic_milestones_feature_flag_enabled?
 
 %aside.right-sidebar.js-right-sidebar{ data: { "auto-collapse" => true, "offset-top" => affix_offset, "spy" => "affix", "always-show-toggle" => true }, class: sidebar_gutter_collapsed_class(false), 'aria-live' => 'polite', 'aria-label': _('Milestone') }
   .issuable-sidebar.milestone-sidebar
@@ -79,12 +78,8 @@
             = sprite_icon('issues')
           %span= milestone.issues_visible_to_user(current_user).count
         .title.hide-collapsed
-          - if milestones_on_epics_enabled
-            = s_('MilestoneSidebar|Work items')
-            = gl_badge_tag milestone.sorted_issues(current_user).length, variant: :muted
-          - else
-            = s_('MilestoneSidebar|Issues')
-            = gl_badge_tag milestone.issues_visible_to_user(current_user).count, variant: :muted
+          = s_('MilestoneSidebar|Work items')
+          = gl_badge_tag milestone.sorted_issues(current_user).length, variant: :muted
           - if show_new_issue_link?(project)
             = link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "gl-float-right", title: s_('MilestoneSidebar|New Issue') do
               = s_('MilestoneSidebar|New issue')
@@ -92,17 +87,11 @@
           %span.milestone-stat
             = link_to milestones_browse_issuables_path(milestone, type: :issues) do
               = s_('MilestoneSidebar|Open:')
-              - if milestones_on_epics_enabled
-                = milestone.sorted_issues(current_user).opened.length
-              - else
-                = milestone.issues_visible_to_user(current_user).opened.count
+              = milestone.sorted_issues(current_user).opened.length
           %span.milestone-stat
             = link_to milestones_browse_issuables_path(milestone, type: :issues, state: 'closed') do
               = s_('MilestoneSidebar|Closed:')
-              - if milestones_on_epics_enabled
-                = milestone.sorted_issues(current_user).closed.length
-              - else
-                = milestone.issues_visible_to_user(current_user).closed.count
+              = milestone.sorted_issues(current_user).closed.length
 
     .block
       .js-sidebar-time-tracking-root{ data: { time_estimate: @milestone.total_time_estimate,
diff --git a/app/views/shared/milestones/_tabs.html.haml b/app/views/shared/milestones/_tabs.html.haml
index 3fd57935a92..1d25b02fa30 100644
--- a/app/views/shared/milestones/_tabs.html.haml
+++ b/app/views/shared/milestones/_tabs.html.haml
@@ -7,12 +7,8 @@
     = sprite_icon('chevron-lg-right', size: 12)
   = gl_tabs_nav({ class: %w[scrolling-tabs js-milestone-tabs] }) do
     = gl_tab_link_to '#tab-issues', item_active: true, data: { endpoint: milestone_tab_path(milestone, 'issues', show_project_name: show_project_name) } do
-      - if @group&.work_item_epic_milestones_feature_flag_enabled?
-        = _('Work items')
-        = gl_tab_counter_badge milestone.sorted_issues(current_user).length
-      - else
-        = _('Issues')
-        = gl_tab_counter_badge milestone.issues_visible_to_user(current_user).size
+      = _('Work items')
+      = gl_tab_counter_badge milestone.sorted_issues(current_user).length
     - if milestone.merge_requests_enabled?
       = gl_tab_link_to '#tab-merge-requests', data: { endpoint: milestone_tab_path(milestone, 'merge_requests', show_project_name: show_project_name) } do
         = _('Merge requests')
diff --git a/config/feature_flags/beta/work_item_epic_milestones.yml b/config/feature_flags/beta/work_item_epic_milestones.yml
deleted file mode 100644
index 31cc1580d8b..00000000000
--- a/config/feature_flags/beta/work_item_epic_milestones.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: work_item_epic_milestones
-description: Adds the milestone widget to Epic Work Items
-feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/329#note_2479555234
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/190104
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/538993
-milestone: '18.0'
-group: group::product planning
-type: beta
-default_enabled: false
diff --git a/db/click_house/main.sql b/db/click_house/main.sql
index 3fc8c7eb0e9..e3841537c0b 100644
--- a/db/click_house/main.sql
+++ b/db/click_house/main.sql
@@ -392,12 +392,12 @@ SETTINGS index_granularity = 8192;
 CREATE TABLE siphon_issues
 (
     `id` Int64,
-    `title` Nullable(String),
+    `title` String DEFAULT '',
     `author_id` Nullable(Int64),
     `project_id` Nullable(Int64),
-    `created_at` Nullable(DateTime64(6, 'UTC')),
-    `updated_at` Nullable(DateTime64(6, 'UTC')),
-    `description` Nullable(String),
+    `created_at` DateTime64(6, 'UTC') DEFAULT now(),
+    `updated_at` DateTime64(6, 'UTC') DEFAULT now(),
+    `description` String DEFAULT '',
     `milestone_id` Nullable(Int64),
     `iid` Nullable(Int64),
     `updated_by_id` Nullable(Int64),
@@ -405,9 +405,7 @@ CREATE TABLE siphon_issues
     `confidential` Bool DEFAULT false,
     `due_date` Nullable(Date32),
     `moved_to_id` Nullable(Int64),
-    `lock_version` Nullable(Int64) DEFAULT 0,
-    `title_html` Nullable(String),
-    `description_html` Nullable(String),
+    `lock_version` Int64 DEFAULT 0,
     `time_estimate` Nullable(Int64) DEFAULT 0,
     `relative_position` Nullable(Int64),
     `service_desk_reply_to` Nullable(String),
@@ -425,8 +423,8 @@ CREATE TABLE siphon_issues
     `sprint_id` Nullable(Int64),
     `blocking_issues_count` Int64 DEFAULT 0,
     `upvotes_count` Int64 DEFAULT 0,
-    `work_item_type_id` Nullable(Int64),
-    `namespace_id` Nullable(Int64),
+    `work_item_type_id` Int64,
+    `namespace_id` Int64,
     `start_date` Nullable(Date32),
     `tmp_epic_id` Nullable(Int64),
     `imported_from` Int8 DEFAULT 0,
@@ -456,14 +454,14 @@ CREATE TABLE siphon_merge_requests
     `source_project_id` Nullable(Int64),
     `author_id` Nullable(Int64),
     `assignee_id` Nullable(Int64),
-    `title` Nullable(String),
-    `created_at` Nullable(DateTime64(6, 'UTC')),
-    `updated_at` Nullable(DateTime64(6, 'UTC')),
+    `title` String DEFAULT '',
+    `created_at` DateTime64(6, 'UTC') DEFAULT now(),
+    `updated_at` DateTime64(6, 'UTC') DEFAULT now(),
     `milestone_id` Nullable(Int64),
     `merge_status` LowCardinality(String) DEFAULT 'unchecked',
     `target_project_id` Int64,
     `iid` Nullable(Int64),
-    `description` Nullable(String),
+    `description` String DEFAULT '',
     `updated_by_id` Nullable(Int64),
     `merge_error` Nullable(String),
     `merge_params` Nullable(String),
@@ -473,9 +471,7 @@ CREATE TABLE siphon_merge_requests
     `approvals_before_merge` Nullable(Int64),
     `rebase_commit_sha` Nullable(String),
     `in_progress_merge_commit_sha` Nullable(String),
-    `lock_version` Nullable(Int64) DEFAULT 0,
-    `title_html` Nullable(String),
-    `description_html` Nullable(String),
+    `lock_version` Int64 DEFAULT 0,
     `time_estimate` Nullable(Int64) DEFAULT 0,
     `squash` Bool DEFAULT false,
     `cached_markdown_version` Nullable(Int64),
@@ -568,7 +564,6 @@ CREATE TABLE siphon_namespaces
     `ldap_sync_last_update_at` Nullable(DateTime64(6, 'UTC')),
     `ldap_sync_last_successful_update_at` Nullable(DateTime64(6, 'UTC')),
     `ldap_sync_last_sync_at` Nullable(DateTime64(6, 'UTC')),
-    `description_html` Nullable(String),
     `lfs_enabled` Nullable(Bool),
     `parent_id` Nullable(Int64),
     `shared_runners_minutes_limit` Nullable(Int64),
@@ -598,7 +593,7 @@ CREATE TABLE siphon_namespaces
     `shared_runners_enabled` Bool DEFAULT true,
     `allow_descendants_override_disabled_shared_runners` Bool DEFAULT false,
     `traversal_ids` Array(Int64) DEFAULT [],
-    `organization_id` Nullable(Int64),
+    `organization_id` Int64,
     `_siphon_replicated_at` DateTime64(6, 'UTC') DEFAULT now(),
     `_siphon_deleted` Bool DEFAULT false
 )
diff --git a/db/click_house/migrate/main/20250625053417_adjust_siphon_issues.rb b/db/click_house/migrate/main/20250625053417_adjust_siphon_issues.rb
new file mode 100644
index 00000000000..b73916c2e25
--- /dev/null
+++ b/db/click_house/migrate/main/20250625053417_adjust_siphon_issues.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class AdjustSiphonIssues < ClickHouse::Migration
+  def up
+    # Avoid nullable so later we can create full-text search indexes
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN title String DEFAULT ''"
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN description String DEFAULT ''"
+
+    # Set default for timestamp columns
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN created_at DateTime64(6, 'UTC') DEFAULT NOW()"
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN updated_at DateTime64(6, 'UTC') DEFAULT NOW()"
+
+    # Not relevant to analytics
+    execute "ALTER TABLE siphon_issues DROP COLUMN IF EXISTS title_html"
+    execute "ALTER TABLE siphon_issues DROP COLUMN IF EXISTS description_html"
+
+    # These columns have NOT NULL check constraint
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN work_item_type_id Int64"
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN namespace_id Int64"
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN lock_version Int64"
+  end
+
+  def down
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN title Nullable(String)"
+
+    if column_default_present?('siphon_issues', 'title')
+      execute "ALTER TABLE siphon_issues MODIFY COLUMN title REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN description Nullable(String)"
+
+    if column_default_present?('siphon_issues', 'description')
+      execute "ALTER TABLE siphon_issues MODIFY COLUMN description REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN created_at Nullable(DateTime64(6, 'UTC'))"
+
+    if column_default_present?('siphon_issues', 'created_at')
+      execute "ALTER TABLE siphon_issues MODIFY COLUMN created_at REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN updated_at Nullable(DateTime64(6, 'UTC'))"
+
+    if column_default_present?('siphon_issues', 'updated_at')
+      execute "ALTER TABLE siphon_issues MODIFY COLUMN updated_at REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_issues ADD COLUMN IF NOT EXISTS title_html Nullable(String)"
+    execute "ALTER TABLE siphon_issues ADD COLUMN IF NOT EXISTS description_html Nullable(String)"
+
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN work_item_type_id Nullable(Int64)"
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN namespace_id Nullable(Int64)"
+    execute "ALTER TABLE siphon_issues MODIFY COLUMN lock_version Nullable(Int64)"
+  end
+end
diff --git a/db/click_house/migrate/main/20250625061106_adjust_siphon_namespaces.rb b/db/click_house/migrate/main/20250625061106_adjust_siphon_namespaces.rb
new file mode 100644
index 00000000000..f7d3f64abf7
--- /dev/null
+++ b/db/click_house/migrate/main/20250625061106_adjust_siphon_namespaces.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AdjustSiphonNamespaces < ClickHouse::Migration
+  def up
+    execute "ALTER TABLE siphon_namespaces DROP COLUMN IF EXISTS description_html"
+
+    execute "ALTER TABLE siphon_namespaces MODIFY COLUMN organization_id Int64"
+  end
+
+  def down
+    execute "ALTER TABLE siphon_namespaces ADD COLUMN IF NOT EXISTS description_html Nullable(String)"
+
+    execute "ALTER TABLE siphon_namespaces MODIFY COLUMN organization_id Nullable(Int64)"
+  end
+end
diff --git a/db/click_house/migrate/main/20250625061624_adjust_siphon_merge_requests.rb b/db/click_house/migrate/main/20250625061624_adjust_siphon_merge_requests.rb
new file mode 100644
index 00000000000..f48fe862e01
--- /dev/null
+++ b/db/click_house/migrate/main/20250625061624_adjust_siphon_merge_requests.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class AdjustSiphonMergeRequests < ClickHouse::Migration
+  def up
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN title String DEFAULT ''"
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN description String DEFAULT ''"
+
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN created_at DateTime64(6, 'UTC') DEFAULT NOW()"
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN updated_at DateTime64(6, 'UTC') DEFAULT NOW()"
+
+    execute "ALTER TABLE siphon_merge_requests DROP COLUMN IF EXISTS title_html"
+    execute "ALTER TABLE siphon_merge_requests DROP COLUMN IF EXISTS description_html"
+
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN lock_version Int64"
+  end
+
+  def down
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN title Nullable(String)"
+
+    if column_default_present?('siphon_merge_requests', 'title')
+      execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN title REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN description Nullable(String)"
+
+    if column_default_present?('siphon_merge_requests', 'description')
+      execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN description REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN created_at Nullable(DateTime64(6, 'UTC'))"
+
+    if column_default_present?('siphon_merge_requests', 'created_at')
+      execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN created_at REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN updated_at Nullable(DateTime64(6, 'UTC'))"
+
+    if column_default_present?('siphon_merge_requests', 'updated_at')
+      execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN updated_at REMOVE DEFAULT"
+    end
+
+    execute "ALTER TABLE siphon_merge_requests ADD COLUMN IF NOT EXISTS title_html Nullable(String)"
+    execute "ALTER TABLE siphon_merge_requests ADD COLUMN IF NOT EXISTS description_html Nullable(String)"
+
+    execute "ALTER TABLE siphon_merge_requests MODIFY COLUMN lock_version Nullable(Int64)"
+  end
+end
diff --git a/db/click_house/schema_migrations/main/20250625053417 b/db/click_house/schema_migrations/main/20250625053417
new file mode 100644
index 00000000000..3c766c7bc41
--- /dev/null
+++ b/db/click_house/schema_migrations/main/20250625053417
@@ -0,0 +1 @@
+0134dca2042b45cd4f9bec29de3d34567352f3e9334f0740f950f74d2a790bcb
\ No newline at end of file
diff --git a/db/click_house/schema_migrations/main/20250625061106 b/db/click_house/schema_migrations/main/20250625061106
new file mode 100644
index 00000000000..1f867764922
--- /dev/null
+++ b/db/click_house/schema_migrations/main/20250625061106
@@ -0,0 +1 @@
+a0d10abd4cedf401f4c6942625e438504811dc1220456b51832429cfbf467cd8
\ No newline at end of file
diff --git a/db/click_house/schema_migrations/main/20250625061624 b/db/click_house/schema_migrations/main/20250625061624
new file mode 100644
index 00000000000..ba4760b364a
--- /dev/null
+++ b/db/click_house/schema_migrations/main/20250625061624
@@ -0,0 +1 @@
+559ac5ddb5a888eb71a303955b83d4955f1165dc85bab17ec130d0b8d9e8f50d
\ No newline at end of file
diff --git a/db/docs/ai_catalog_items.yml b/db/docs/ai_catalog_items.yml
new file mode 100644
index 00000000000..2dfe694e494
--- /dev/null
+++ b/db/docs/ai_catalog_items.yml
@@ -0,0 +1,12 @@
+---
+table_name: ai_catalog_items
+classes:
+  - Ai::Catalog::Item
+feature_categories:
+  - workflow_catalog
+description: AI catalog items
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/195391
+milestone: "18.2"
+gitlab_schema: gitlab_main_cell
+sharding_key:
+  organization_id: organizations
diff --git a/db/migrate/20250619122935_create_ai_catalog_items.rb b/db/migrate/20250619122935_create_ai_catalog_items.rb
new file mode 100644
index 00000000000..ff1ca1ece76
--- /dev/null
+++ b/db/migrate/20250619122935_create_ai_catalog_items.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateAiCatalogItems < Gitlab::Database::Migration[2.3]
+  milestone '18.2'
+
+  def change
+    create_table :ai_catalog_items do |t| # rubocop:disable Migration/EnsureFactoryForTable -- False Positive, does exist in ee/spec/factories/ai/catalog/item.rb
+      t.bigint :organization_id, index: true, null: false
+      t.bigint :project_id, index: true
+      t.timestamps_with_timezone null: false
+      t.integer :item_type, limit: 2, index: true, null: false
+
+      t.text :description, null: false, limit: 1_024
+      t.text :name, null: false, limit: 255
+    end
+  end
+end
diff --git a/db/migrate/20250619211342_add_organization_fk_to_ai_catalog_items.rb b/db/migrate/20250619211342_add_organization_fk_to_ai_catalog_items.rb
new file mode 100644
index 00000000000..bfff34934fe
--- /dev/null
+++ b/db/migrate/20250619211342_add_organization_fk_to_ai_catalog_items.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddOrganizationFkToAiCatalogItems < Gitlab::Database::Migration[2.3]
+  disable_ddl_transaction!
+  milestone '18.2'
+
+  def up
+    add_concurrent_foreign_key :ai_catalog_items, :organizations, column: :organization_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key_if_exists :ai_catalog_items, column: :organization_id
+    end
+  end
+end
diff --git a/db/migrate/20250619211706_add_project_fk_to_ai_catalog_items.rb b/db/migrate/20250619211706_add_project_fk_to_ai_catalog_items.rb
new file mode 100644
index 00000000000..8ec356dacce
--- /dev/null
+++ b/db/migrate/20250619211706_add_project_fk_to_ai_catalog_items.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddProjectFkToAiCatalogItems < Gitlab::Database::Migration[2.3]
+  disable_ddl_transaction!
+  milestone '18.2'
+
+  def up
+    add_concurrent_foreign_key :ai_catalog_items, :projects, column: :project_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key_if_exists :ai_catalog_items, column: :project_id
+    end
+  end
+end
diff --git a/db/migrate/20250624063009_rename_namespace_descendants_active_project_ids_to_unarchived_project_ids.rb b/db/migrate/20250624063009_rename_namespace_descendants_active_project_ids_to_unarchived_project_ids.rb
new file mode 100644
index 00000000000..78126b77397
--- /dev/null
+++ b/db/migrate/20250624063009_rename_namespace_descendants_active_project_ids_to_unarchived_project_ids.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RenameNamespaceDescendantsActiveProjectIdsToUnarchivedProjectIds < Gitlab::Database::Migration[2.3]
+  milestone '18.2'
+
+  disable_ddl_transaction!
+
+  def up
+    rename_column_concurrently :namespace_descendants, :all_active_project_ids,
+      :all_unarchived_project_ids, type: 'bigint[]', batch_column_name: :namespace_id
+  end
+
+  def down
+    undo_rename_column_concurrently :namespace_descendants, :all_active_project_ids,
+      :all_unarchived_project_ids
+  end
+end
diff --git a/db/schema_migrations/20250619122935 b/db/schema_migrations/20250619122935
new file mode 100644
index 00000000000..d177e0005c2
--- /dev/null
+++ b/db/schema_migrations/20250619122935
@@ -0,0 +1 @@
+0a40f7716a0313a4e55fc8bc3247728ca9e55106faeee944ab034ff084aaa72f
\ No newline at end of file
diff --git a/db/schema_migrations/20250619211342 b/db/schema_migrations/20250619211342
new file mode 100644
index 00000000000..f1e043e2673
--- /dev/null
+++ b/db/schema_migrations/20250619211342
@@ -0,0 +1 @@
+af78ef1a07d60c08fcbc18c49ee546e6e9c257420228c039ba557c3f06e07ff3
\ No newline at end of file
diff --git a/db/schema_migrations/20250619211706 b/db/schema_migrations/20250619211706
new file mode 100644
index 00000000000..a9c0aeb4a16
--- /dev/null
+++ b/db/schema_migrations/20250619211706
@@ -0,0 +1 @@
+44cc2dad1c6aa270264adda0a58948c74449dfe6a1a15418abf256a87c22f401
\ No newline at end of file
diff --git a/db/schema_migrations/20250624063009 b/db/schema_migrations/20250624063009
new file mode 100644
index 00000000000..8d1afeed63d
--- /dev/null
+++ b/db/schema_migrations/20250624063009
@@ -0,0 +1 @@
+c79c649fe40c6a4ca49cbcf440009ba7856f8148c4d06e4cd10f348ae7a2f0ab
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 03357e51e87..54cc05dec31 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -441,6 +441,15 @@ BEGIN
 END;
 $$;
 
+CREATE FUNCTION function_for_trigger_03be0f8add7e() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  NEW."all_unarchived_project_ids" := NEW."all_active_project_ids";
+  RETURN NEW;
+END
+$$;
+
 CREATE FUNCTION function_for_trigger_1baf8c8e1f66() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -450,6 +459,15 @@ BEGIN
 END
 $$;
 
+CREATE FUNCTION function_for_trigger_7d6a4f5b82c2() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  NEW."all_active_project_ids" := NEW."all_unarchived_project_ids";
+  RETURN NEW;
+END
+$$;
+
 CREATE FUNCTION function_for_trigger_7f41427eda69() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -509,6 +527,22 @@ BEGIN
 END
 $$;
 
+CREATE FUNCTION function_for_trigger_de99bb993511() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  IF NEW."all_active_project_ids" IS NOT DISTINCT FROM '{}' AND NEW."all_unarchived_project_ids" IS DISTINCT FROM '{}' THEN
+    NEW."all_active_project_ids" = NEW."all_unarchived_project_ids";
+  END IF;
+
+  IF NEW."all_unarchived_project_ids" IS NOT DISTINCT FROM '{}' AND NEW."all_active_project_ids" IS DISTINCT FROM '{}' THEN
+    NEW."all_unarchived_project_ids" = NEW."all_active_project_ids";
+  END IF;
+
+  RETURN NEW;
+END
+$$;
+
 CREATE FUNCTION gitlab_schema_prevent_write() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -6799,7 +6833,9 @@ CREATE TABLE namespace_descendants (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 )
 PARTITION BY HASH (namespace_id);
 
@@ -6810,7 +6846,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_00 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_01 (
@@ -6820,7 +6858,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_01 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_02 (
@@ -6830,7 +6870,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_02 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_03 (
@@ -6840,7 +6882,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_03 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_04 (
@@ -6850,7 +6894,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_04 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_05 (
@@ -6860,7 +6906,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_05 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_06 (
@@ -6870,7 +6918,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_06 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_07 (
@@ -6880,7 +6930,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_07 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_08 (
@@ -6890,7 +6942,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_08 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_09 (
@@ -6900,7 +6954,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_09 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_10 (
@@ -6910,7 +6966,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_10 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_11 (
@@ -6920,7 +6978,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_11 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_12 (
@@ -6930,7 +6990,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_12 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_13 (
@@ -6940,7 +7002,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_13 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_14 (
@@ -6950,7 +7014,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_14 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_15 (
@@ -6960,7 +7026,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_15 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_16 (
@@ -6970,7 +7038,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_16 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_17 (
@@ -6980,7 +7050,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_17 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_18 (
@@ -6990,7 +7062,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_18 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_19 (
@@ -7000,7 +7074,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_19 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_20 (
@@ -7010,7 +7086,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_20 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_21 (
@@ -7020,7 +7098,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_21 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_22 (
@@ -7030,7 +7110,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_22 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_23 (
@@ -7040,7 +7122,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_23 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_24 (
@@ -7050,7 +7134,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_24 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_25 (
@@ -7060,7 +7146,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_25 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_26 (
@@ -7070,7 +7158,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_26 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_27 (
@@ -7080,7 +7170,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_27 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_28 (
@@ -7090,7 +7182,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_28 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_29 (
@@ -7100,7 +7194,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_29 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_30 (
@@ -7110,7 +7206,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_30 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE gitlab_partitions_static.namespace_descendants_31 (
@@ -7120,7 +7218,9 @@ CREATE TABLE gitlab_partitions_static.namespace_descendants_31 (
     traversal_ids bigint[] DEFAULT ARRAY[]::bigint[] NOT NULL,
     outdated_at timestamp with time zone,
     calculated_at timestamp with time zone,
-    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL
+    all_active_project_ids bigint[] DEFAULT '{}'::bigint[] NOT NULL,
+    all_unarchived_project_ids bigint[] DEFAULT '{}'::bigint[],
+    CONSTRAINT check_60ae9ef706 CHECK ((all_unarchived_project_ids IS NOT NULL))
 );
 
 CREATE TABLE virtual_registries_packages_maven_cache_entries (
@@ -8117,6 +8217,28 @@ CREATE SEQUENCE ai_agents_id_seq
 
 ALTER SEQUENCE ai_agents_id_seq OWNED BY ai_agents.id;
 
+CREATE TABLE ai_catalog_items (
+    id bigint NOT NULL,
+    organization_id bigint NOT NULL,
+    project_id bigint,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    item_type smallint NOT NULL,
+    description text NOT NULL,
+    name text NOT NULL,
+    CONSTRAINT check_7e02a4805b CHECK ((char_length(description) <= 1024)),
+    CONSTRAINT check_edddd6e1fe CHECK ((char_length(name) <= 255))
+);
+
+CREATE SEQUENCE ai_catalog_items_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE ai_catalog_items_id_seq OWNED BY ai_catalog_items.id;
+
 CREATE SEQUENCE ai_code_suggestion_events_id_seq
     START WITH 1
     INCREMENT BY 1
@@ -27188,6 +27310,8 @@ ALTER TABLE ONLY ai_agent_versions ALTER COLUMN id SET DEFAULT nextval('ai_agent
 
 ALTER TABLE ONLY ai_agents ALTER COLUMN id SET DEFAULT nextval('ai_agents_id_seq'::regclass);
 
+ALTER TABLE ONLY ai_catalog_items ALTER COLUMN id SET DEFAULT nextval('ai_catalog_items_id_seq'::regclass);
+
 ALTER TABLE ONLY ai_code_suggestion_events ALTER COLUMN id SET DEFAULT nextval('ai_code_suggestion_events_id_seq'::regclass);
 
 ALTER TABLE ONLY ai_conversation_messages ALTER COLUMN id SET DEFAULT nextval('ai_conversation_messages_id_seq'::regclass);
@@ -29224,6 +29348,9 @@ ALTER TABLE ONLY ai_agent_versions
 ALTER TABLE ONLY ai_agents
     ADD CONSTRAINT ai_agents_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY ai_catalog_items
+    ADD CONSTRAINT ai_catalog_items_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY ai_code_suggestion_events
     ADD CONSTRAINT ai_code_suggestion_events_pkey PRIMARY KEY (id, "timestamp");
 
@@ -34233,6 +34360,12 @@ CREATE INDEX index_ai_agent_versions_on_project_id ON ai_agent_versions USING bt
 
 CREATE UNIQUE INDEX index_ai_agents_on_project_id_and_name ON ai_agents USING btree (project_id, name);
 
+CREATE INDEX index_ai_catalog_items_on_item_type ON ai_catalog_items USING btree (item_type);
+
+CREATE INDEX index_ai_catalog_items_on_organization_id ON ai_catalog_items USING btree (organization_id);
+
+CREATE INDEX index_ai_catalog_items_on_project_id ON ai_catalog_items USING btree (project_id);
+
 CREATE INDEX index_ai_code_suggestion_events_on_organization_id ON ONLY ai_code_suggestion_events USING btree (organization_id);
 
 CREATE INDEX index_ai_code_suggestion_events_on_user_id ON ONLY ai_code_suggestion_events USING btree (user_id);
@@ -41667,6 +41800,8 @@ CREATE TRIGGER trigger_02450faab875 BEFORE INSERT OR UPDATE ON vulnerability_occ
 
 CREATE TRIGGER trigger_038fe84feff7 BEFORE INSERT OR UPDATE ON approvals FOR EACH ROW EXECUTE FUNCTION trigger_038fe84feff7();
 
+CREATE TRIGGER trigger_03be0f8add7e BEFORE UPDATE OF all_active_project_ids ON namespace_descendants FOR EACH ROW EXECUTE FUNCTION function_for_trigger_03be0f8add7e();
+
 CREATE TRIGGER trigger_05cc4448a8aa BEFORE INSERT OR UPDATE ON protected_branch_merge_access_levels FOR EACH ROW EXECUTE FUNCTION trigger_05cc4448a8aa();
 
 CREATE TRIGGER trigger_05ce163deddf BEFORE INSERT OR UPDATE ON status_check_responses FOR EACH ROW EXECUTE FUNCTION trigger_05ce163deddf();
@@ -41871,6 +42006,8 @@ CREATE TRIGGER trigger_7b21c87a1f91 BEFORE INSERT OR UPDATE ON bulk_import_failu
 
 CREATE TRIGGER trigger_7b378a0c402b BEFORE INSERT OR UPDATE ON issue_user_mentions FOR EACH ROW EXECUTE FUNCTION trigger_7b378a0c402b();
 
+CREATE TRIGGER trigger_7d6a4f5b82c2 BEFORE UPDATE OF all_unarchived_project_ids ON namespace_descendants FOR EACH ROW EXECUTE FUNCTION function_for_trigger_7d6a4f5b82c2();
+
 CREATE TRIGGER trigger_7de792ddbc05 BEFORE INSERT OR UPDATE ON dast_site_validations FOR EACH ROW EXECUTE FUNCTION trigger_7de792ddbc05();
 
 CREATE TRIGGER trigger_7e2eed79e46e BEFORE INSERT OR UPDATE ON abuse_reports FOR EACH ROW EXECUTE FUNCTION trigger_7e2eed79e46e();
@@ -42031,6 +42168,8 @@ CREATE TRIGGER trigger_dc13168b8025 BEFORE INSERT OR UPDATE ON vulnerability_fla
 
 CREATE TRIGGER trigger_de59b81d3044 BEFORE INSERT OR UPDATE ON bulk_import_export_batches FOR EACH ROW EXECUTE FUNCTION trigger_de59b81d3044();
 
+CREATE TRIGGER trigger_de99bb993511 BEFORE INSERT ON namespace_descendants FOR EACH ROW EXECUTE FUNCTION function_for_trigger_de99bb993511();
+
 CREATE TRIGGER trigger_delete_project_namespace_on_project_delete AFTER DELETE ON projects FOR EACH ROW WHEN ((old.project_namespace_id IS NOT NULL)) EXECUTE FUNCTION delete_associated_project_namespace();
 
 CREATE TRIGGER trigger_dfad97659d5f BEFORE INSERT OR UPDATE ON issuable_severities FOR EACH ROW EXECUTE FUNCTION trigger_dfad97659d5f();
@@ -42164,6 +42303,9 @@ ALTER TABLE ONLY namespace_deletion_schedules
 ALTER TABLE ONLY environments
     ADD CONSTRAINT fk_01a033a308 FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY ai_catalog_items
+    ADD CONSTRAINT fk_01a07cc378 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY agent_user_access_project_authorizations
     ADD CONSTRAINT fk_0250c0ad51 FOREIGN KEY (agent_id) REFERENCES cluster_agents(id) ON DELETE CASCADE;
 
@@ -42347,6 +42489,9 @@ ALTER TABLE ONLY cluster_agent_migrations
 ALTER TABLE ONLY namespace_cluster_agent_mappings
     ADD CONSTRAINT fk_124d8167c5 FOREIGN KEY (creator_id) REFERENCES users(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY ai_catalog_items
+    ADD CONSTRAINT fk_128a8d1e59 FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY cluster_agent_url_configurations
     ADD CONSTRAINT fk_12d4a33b65 FOREIGN KEY (created_by_user_id) REFERENCES users(id) ON DELETE SET NULL;
 
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 98e140bcb6f..f6808907a8c 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -1105,6 +1105,9 @@ Example configuration:
        args: {
                assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
                idp_cert_fingerprint: '2f:cb:19:57:68:c3:9e:9a:94:ce:c2:c2:e3:2c:59:c0:aa:d7:a3:36:5c:10:89:2e:81:16:b5:d8:3d:40:96:b6',
+               # or
+               # idp_cert: '-----BEGIN CERTIFICATE-----\n ... \n-----END CERTIFICATE-----',
+
                idp_sso_target_url: 'https://login.example.com/idp',
                issuer: 'https://gitlab.example.com',
                name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
@@ -1134,6 +1137,8 @@ Example configuration:
    args:
      assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback'
      idp_cert_fingerprint: '2f:cb:19:57:68:c3:9e:9a:94:ce:c2:c2:e3:2c:59:c0:aa:d7:a3:36:5c:10:89:2e:81:16:b5:d8:3d:40:96:b6'
+     # or
+     # idp_cert: '-----BEGIN CERTIFICATE-----\n ... \n-----END CERTIFICATE-----',
      idp_sso_target_url: 'https://login.example.com/idp'
      issuer: 'https://gitlab.example.com'
      name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
@@ -1269,6 +1274,9 @@ Example configuration:
        args: {
                assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
                idp_cert_fingerprint: '2f:cb:19:57:68:c3:9e:9a:94:ce:c2:c2:e3:2c:59:c0:aa:d7:a3:36:5c:10:89:2e:81:16:b5:d8:3d:40:96:b6',
+               # or
+               # idp_cert: '-----BEGIN CERTIFICATE-----\n ... \n-----END CERTIFICATE-----',
+
                idp_sso_target_url: 'https://login.example.com/idp',
                issuer: 'https://gitlab.example.com',
                name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
@@ -1776,7 +1784,7 @@ membership is required.
 
 ### Using `idp_cert_fingerprint`
 
-You configure the response signature validation using `idp_cert_fingerprint`.
+You can configure the response signature validation using `idp_cert_fingerprint`.
 An example configuration:
 
 {{< tabs >}}
@@ -1922,8 +1930,7 @@ An example configuration:
 
 ### Using `idp_cert`
 
-If your IdP does not support configuring this using `idp_cert_fingerprint`, you
-can instead configure GitLab directly using `idp_cert`.
+You can also configure GitLab directly using `idp_cert`.
 An example configuration:
 
 {{< tabs >}}
diff --git a/doc/user/analytics/ai_impact_analytics.md b/doc/user/analytics/ai_impact_analytics.md
index 4eef15a8cce..d546f34f97e 100644
--- a/doc/user/analytics/ai_impact_analytics.md
+++ b/doc/user/analytics/ai_impact_analytics.md
@@ -67,11 +67,12 @@ The **Metric trends** table displays metrics for the last six months, with month
 
 ### Lifecycle metrics
 
-- [**Cycle time**](../group/value_stream_analytics/_index.md#lifecycle-metrics)
 - [**Lead time**](../group/value_stream_analytics/_index.md#lifecycle-metrics)
+- [**Median time to merge**](merge_request_analytics.md)
 - [**Deployment frequency**](dora_metrics.md#deployment-frequency)
-- [**Change failure rate**](dora_metrics.md#change-failure-rate)
+- [**Merge request throughput**](merge_request_analytics.md#view-the-number-of-merge-requests-in-a-date-range)
 - [**Critical vulnerabilities over time**](../application_security/vulnerability_report/_index.md)
+- [**Contributor count**](../profile/contributions_calendar.md#user-contribution-events)
 
 ### AI usage metrics
 
diff --git a/gems/gitlab-schema-validation/Gemfile.lock b/gems/gitlab-schema-validation/Gemfile.lock
index fff97052619..7ab20694289 100644
--- a/gems/gitlab-schema-validation/Gemfile.lock
+++ b/gems/gitlab-schema-validation/Gemfile.lock
@@ -17,6 +17,7 @@ GEM
     benchmark-malloc (0.2.0)
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
+    bigdecimal (3.2.2)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     coderay (1.1.3)
@@ -30,7 +31,9 @@ GEM
       rubocop-performance (~> 1.15)
       rubocop-rails (~> 2.17)
       rubocop-rspec (~> 2.22)
-    google-protobuf (3.23.3)
+    google-protobuf (4.31.1)
+      bigdecimal
+      rake (>= 13)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
@@ -41,8 +44,8 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.3)
-    pg_query (4.2.1)
-      google-protobuf (>= 3.22.3)
+    pg_query (6.1.0)
+      google-protobuf (>= 3.25.3)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -53,6 +56,7 @@ GEM
     racc (1.7.1)
     rack (3.1.8)
     rainbow (3.1.1)
+    rake (13.3.0)
     regexp_parser (2.8.1)
     rexml (3.3.9)
     rspec (3.12.0)
@@ -141,6 +145,7 @@ CHECKSUMS
   benchmark-malloc (0.2.0) sha256=37c68f0435261634026f584d79956a35325a3027e3e6b4cc8d7575aa10537e6b
   benchmark-perf (0.6.0) sha256=fe2b01959f3de0f9dd34820d54ef881eb4f3589fccb7d17b63068ac92d7f9621
   benchmark-trend (0.4.0) sha256=de5a02a9f443babefbbd97784759820decee8554a0c273d859c02a0990845d81
+  bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
   binding_of_caller (1.0.0) sha256=3aad25d1d538fc6e7972978f9bf512ccd992784009947c81633bea776713161d
   coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
   concurrent-ruby (1.2.2) sha256=3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f
@@ -149,7 +154,7 @@ CHECKSUMS
   diffy (3.4.2) sha256=36b42ffbe5138ddc56182107c24ad8d6b066ecfd2876829f391e3a4993d89ae1
   gitlab-schema-validation (0.1.0)
   gitlab-styles (10.1.0) sha256=f42745f5397d042fe24cf2d0eb56c995b37f9f43d8fb79b834d197a1cafdc84a
-  google-protobuf (3.23.3) sha256=4dbc0a28db959cd37ccbb040da5c54b7bd672ef3b923d0dd0a99ea26cbdf9fa9
+  google-protobuf (4.31.1) sha256=022bc82931a0860a7f2ace41bd48e904c8e65032c1d5eefc33294b5edf9741f8
   i18n (1.14.1) sha256=9d03698903547c060928e70a9bc8b6b87fda674453cda918fc7ab80235ae4a61
   json (2.6.3) sha256=86aaea16adf346a2b22743d88f8dcceeb1038843989ab93cda44b5176c845459
   method_source (1.0.0) sha256=d779455a2b5666a079ce58577bfad8534f571af7cec8107f4dce328f0981dede
@@ -157,12 +162,13 @@ CHECKSUMS
   parallel (1.23.0) sha256=27154713ad6ef32fa3dcb7788a721d6c07bca77e72443b4c6080a14145288c49
   parser (3.2.2.3) sha256=10685f358ab36ffea2252dc4952e5b8fad3a297a8152a85f59adc982747b91eb
   pg (1.5.3) sha256=6b9ee5e2d5aee975588232c41f8203e766157cf71dba54ee85b343a45ced9bfd
-  pg_query (4.2.1) sha256=b04820a9d1c0c1608e3240b7d84baabbee1b95a7302f29fdd0f00e901c604833
+  pg_query (6.1.0) sha256=8b005229e209f12c5887c34c60d0eb2a241953b9475b53a9840d24578532481e
   proc_to_ast (0.1.0) sha256=92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691
   pry (0.14.2) sha256=c4fe54efedaca1d351280b45b8849af363184696fcac1c72e0415f9bdac4334d
   racc (1.7.1) sha256=af64124836fdd3c00e830703d7f873ea5deabde923f37006a39f5a5e0da16387
   rack (3.1.8) sha256=d3fbcbca43dc2b43c9c6d7dfbac01667ae58643c42cea10013d0da970218a1b1
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
   regexp_parser (2.8.1) sha256=83f63e2bfae3db38f988c66f114485140ff1791321fd827480bc75aa42cacb8c
   rexml (3.3.9) sha256=d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9
   rspec (3.12.0) sha256=ccc41799a43509dc0be84070e3f0410ac95cbd480ae7b6c245543eb64162399c
diff --git a/gems/gitlab-schema-validation/lib/gitlab/schema/validation/adapters/column_structure_sql_adapter.rb b/gems/gitlab-schema-validation/lib/gitlab/schema/validation/adapters/column_structure_sql_adapter.rb
index 5b6026a1f73..c2ddceb9f13 100644
--- a/gems/gitlab-schema-validation/lib/gitlab/schema/validation/adapters/column_structure_sql_adapter.rb
+++ b/gems/gitlab-schema-validation/lib/gitlab/schema/validation/adapters/column_structure_sql_adapter.rb
@@ -119,8 +119,21 @@ module Gitlab
           def parse_a_const(a_const)
             return unless a_const
 
-            type = a_const.val
-            get_value_from_key(a_const, key: type)
+            # In https://github.com/pganalyze/libpg_query/blob/17-6.1.0/protobuf/pg_query.proto,
+            # val is a oneof protobuf type. As explained in https://protobuf.dev/reference/ruby/ruby-generated/,
+            # at most one of the fields can be set. We can't use get_value_from_key
+            # because to_h may return an empty ival if the default value was set
+            # due to a google-protobuf 4 change to address
+            # https://github.com/protocolbuffers/protobuf/issues/6167.
+            #
+            # Get the active oneof field and use two public send methods.
+            # For example, if :ival is active, call `ival.ival`.
+            field_name = a_const.val
+            return unless field_name
+
+            # rubocop:disable GitlabSecurity/PublicSend -- This is the cleanest way to do this with a oneof protobuf type.
+            a_const.public_send(field_name)&.public_send(field_name)
+            # rubocop:enable GitlabSecurity/PublicSend
           end
 
           def get_value_from_key(node, key:)
diff --git a/lib/click_house/migration.rb b/lib/click_house/migration.rb
index 0c8110f83d5..02bc0599111 100644
--- a/lib/click_house/migration.rb
+++ b/lib/click_house/migration.rb
@@ -73,5 +73,22 @@ module ClickHouse
       length = [0, 75 - text.length].max
       write format('== %s %s', text, '=' * length)
     end
+
+    def column_default_present?(table, column)
+      q = <<~SQL
+      SELECT default_expression
+      FROM system.columns
+      WHERE table = {table:String} AND name = {column:String} AND database = {database:String}
+      SQL
+
+      query = ClickHouse::Client::Query.new(raw_query: q, placeholders: {
+        table: table,
+        column: column,
+        database: connection.database_name
+      })
+
+      row = connection.select(query).first
+      row['default_expression'] != ''
+    end
   end
 end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 031f2f5b94e..35f24827d25 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -251,11 +251,6 @@ msgid_plural "%d commits,"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d completed issue"
-msgid_plural "%d completed issues"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] ""
@@ -1605,9 +1600,6 @@ msgstr ""
 msgid "%{total}"
 msgstr ""
 
-msgid "%{total} remaining issue weight"
-msgstr ""
-
 msgid "%{total} remaining weight"
 msgstr ""
 
@@ -11503,9 +11495,6 @@ msgstr ""
 msgid "BulkImport|Import without projects"
 msgstr ""
 
-msgid "BulkImport|Importing projects is a %{docsLinkStart}beta%{docsLinkEnd} feature."
-msgstr ""
-
 msgid "BulkImport|Importing the group failed."
 msgstr ""
 
@@ -11551,7 +11540,7 @@ msgstr ""
 msgid "BulkImport|No parent"
 msgstr ""
 
-msgid "BulkImport|Only groups you have the %{role} role for are listed for import."
+msgid "BulkImport|Only groups that you have the %{role} role for from %{source} are listed for import."
 msgstr ""
 
 msgid "BulkImport|Path of the new group"
@@ -11578,7 +11567,7 @@ msgstr ""
 msgid "BulkImport|Select parent group"
 msgstr ""
 
-msgid "BulkImport|Select the groups and projects you want to import."
+msgid "BulkImport|Select the groups you want to import."
 msgstr ""
 
 msgid "BulkImport|Select whether user memberships in groups and projects are imported."
@@ -11587,12 +11576,6 @@ msgstr ""
 msgid "BulkImport|Showing %{start}-%{end} of %{total}"
 msgstr ""
 
-msgid "BulkImport|Showing %{start}-%{end} of %{total} that you own from %{link}"
-msgstr ""
-
-msgid "BulkImport|Showing %{start}-%{end} of %{total} that you own matching filter \"%{filter}\" from %{link}"
-msgstr ""
-
 msgid "BulkImport|Some groups are imported without projects."
 msgstr ""
 
@@ -33975,9 +33958,6 @@ msgstr ""
 msgid "Issue cannot be found."
 msgstr ""
 
-msgid "Issue count"
-msgstr ""
-
 msgid "Issue created from vulnerability %{vulnerability_link}"
 msgstr ""
 
@@ -35754,9 +35734,6 @@ msgstr ""
 msgid "KubernetesDashboard|Learn more"
 msgstr ""
 
-msgid "KubernetesDashboard|Logs"
-msgstr ""
-
 msgid "KubernetesDashboard|Name"
 msgstr ""
 
@@ -39162,9 +39139,6 @@ msgstr ""
 msgid "MilestoneSidebar|From"
 msgstr ""
 
-msgid "MilestoneSidebar|Issues"
-msgstr ""
-
 msgid "MilestoneSidebar|Merge requests"
 msgstr ""
 
@@ -39219,9 +39193,6 @@ msgstr ""
 msgid "Milestones|Completed"
 msgstr ""
 
-msgid "Milestones|Completed Issues (closed)"
-msgstr ""
-
 msgid "Milestones|Create a milestone to better track your issues and merge requests. %{learn_more_link}"
 msgstr ""
 
@@ -39246,9 +39217,6 @@ msgstr ""
 msgid "Milestones|Ongoing"
 msgstr ""
 
-msgid "Milestones|Ongoing Issues (open and assigned)"
-msgstr ""
-
 msgid "Milestones|Organize issues and merge requests into a cohesive group, and set optional start and due dates. %{learn_more_link}"
 msgstr ""
 
@@ -39273,9 +39241,6 @@ msgstr ""
 msgid "Milestones|Unstarted"
 msgstr ""
 
-msgid "Milestones|Unstarted Issues (open and unassigned)"
-msgstr ""
-
 msgid "Milestones|Use milestones to track issues and merge requests over a fixed period of time"
 msgstr ""
 
@@ -58903,9 +58868,6 @@ msgid_plural "Showing %{count} projects"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Showing %{limit} of %{total_count} issues. "
-msgstr ""
-
 msgid "Showing %{limit} of %{total_count} items. "
 msgstr ""
 
@@ -64999,9 +64961,6 @@ msgstr ""
 msgid "Total cores (CPUs)"
 msgstr ""
 
-msgid "Total issue weight"
-msgstr ""
-
 msgid "Total memory (GB)"
 msgstr ""
 
@@ -68018,9 +67977,6 @@ msgstr ""
 msgid "View all environments."
 msgstr ""
 
-msgid "View all issues"
-msgstr ""
-
 msgid "View all personal projects"
 msgstr ""
 
diff --git a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb
index 533f0e3b122..4e501cb2e2e 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb
@@ -17,7 +17,7 @@ module QA
               job:
                 tags:
                   - #{executor}
-                script: echo $PROTECTED_VARIABLE
+                script: echo $PROTECTED_VARIABLE && echo "Is branch protected? $CI_COMMIT_REF_PROTECTED"
             YAML
           }
         ])
diff --git a/spec/db/clickhouse_siphon_tables_spec.rb b/spec/db/clickhouse_siphon_tables_spec.rb
index e5d603dd3f0..fcea4b2066d 100644
--- a/spec/db/clickhouse_siphon_tables_spec.rb
+++ b/spec/db/clickhouse_siphon_tables_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'ClickHouse siphon tables', :click_house, feature_category: :database do
   let_it_be(:siphon_table_prefix) { 'siphon_' }
   let_it_be(:skip_tables) { [] } # insert table name in the array to be skipped on specs
-  let_it_be(:skip_fields) { [] } # insert field name in the array to be skipped on specs
+  let_it_be(:skip_fields) { %(title_html description_html) } # insert field name in the array to be skipped on specs
   let_it_be(:ch_database_name) { ClickHouse::Client.configuration.databases[:main].database }
   let_it_be(:pg_type_map) { Gitlab::ClickHouse::SiphonGenerator::PG_TYPE_MAP }
 
diff --git a/spec/features/groups/import_export/connect_instance_spec.rb b/spec/features/groups/import_export/connect_instance_spec.rb
index 402cad9c3e4..e9b0df27194 100644
--- a/spec/features/groups/import_export/connect_instance_spec.rb
+++ b/spec/features/groups/import_export/connect_instance_spec.rb
@@ -29,7 +29,6 @@ RSpec.describe 'Import/Export - Connect to another instance', :js, feature_categ
 
         click_on 'Connect instance'
 
-        expect(page).to have_content 'Showing 1-1 of 42 groups that you own from %{url}' % { url: source_url }
         expect(page).to have_content 'stub-group'
 
         visit '/'
diff --git a/spec/features/milestones/user_creates_milestone_spec.rb b/spec/features/milestones/user_creates_milestone_spec.rb
index c76ea92185c..3f0ddf008a8 100644
--- a/spec/features/milestones/user_creates_milestone_spec.rb
+++ b/spec/features/milestones/user_creates_milestone_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe "User creates milestone", :js, feature_category: :team_planning d
       click_button("Create milestone")
 
       expect(page).to have_content(title)
-        .and have_content("Issues")
+        .and have_content("Work items")
         .and have_header_with_correct_id_and_link(1, "Description header", "description-header")
 
       visit(activity_project_path(project))
@@ -35,7 +35,6 @@ RSpec.describe "User creates milestone", :js, feature_category: :team_planning d
 
   before do
     sign_in(user)
-    stub_feature_flags(work_item_epic_milestones: false)
     visit(new_project_milestone_path(project))
   end
 
diff --git a/spec/features/milestones/user_views_milestone_spec.rb b/spec/features/milestones/user_views_milestone_spec.rb
index 6d859e5ef55..bd08ebb7221 100644
--- a/spec/features/milestones/user_views_milestone_spec.rb
+++ b/spec/features/milestones/user_views_milestone_spec.rb
@@ -71,20 +71,6 @@ RSpec.describe "User views milestone", feature_category: :team_planning do
 
     context 'when issues on milestone are over DISPLAY_ISSUES_LIMIT' do
       it "limits issues to display and shows warning" do
-        stub_feature_flags(work_item_epic_milestones: false)
-        stub_const('Milestoneish::DISPLAY_ISSUES_LIMIT', 3)
-
-        visit(project_milestone_path(project, milestone))
-
-        expect(page).to have_selector('#tab-issues li', count: 3)
-        expect(page).to have_selector('#milestone-issue-count-warning', text: 'Showing 3 of 6 issues. View all issues')
-        expect(page).to have_link('View all issues', href: project_issues_path(project, { milestone_title: milestone.title }))
-      end
-    end
-
-    context 'when issues on milestone are over DISPLAY_ISSUES_LIMIT and work_item_epic_milestones FF is on' do
-      it "limits issues to display and shows warning" do
-        stub_feature_flags(work_item_epic_milestones: true)
         stub_const('Milestoneish::DISPLAY_ISSUES_LIMIT', 3)
 
         visit(project_milestone_path(project, milestone))
diff --git a/spec/features/projects/milestones/milestone_spec.rb b/spec/features/projects/milestones/milestone_spec.rb
index 46f7f6c6d2c..d55ff1e96f8 100644
--- a/spec/features/projects/milestones/milestone_spec.rb
+++ b/spec/features/projects/milestones/milestone_spec.rb
@@ -22,7 +22,6 @@ RSpec.describe 'Project milestone', :js, feature_category: :team_planning do
 
   before do
     sign_in(user)
-    stub_feature_flags(work_item_epic_milestones: false)
   end
 
   context 'when project has enabled issues' do
@@ -30,17 +29,16 @@ RSpec.describe 'Project milestone', :js, feature_category: :team_planning do
       visit project_milestone_path(project, milestone)
     end
 
-    it 'shows issues tab' do
+    it 'shows work items tab' do
       within('#content-body') do
-        expect(page).to have_link 'Issues', href: '#tab-issues'
+        expect(page).to have_link 'Work items', href: '#tab-issues'
         expect(page).to have_selector active_tab_selector, count: 1
-        expect(find(active_tab_selector)).to have_content 'Issues'
-        expect(page).to have_text('Unstarted Issues')
+        expect(find(active_tab_selector)).to have_content 'Work items'
       end
     end
 
-    it 'shows issues stats' do
-      expect(find('.milestone-sidebar')).to have_content 'Issues 0'
+    it 'shows Work item stats' do
+      expect(find('.milestone-sidebar')).to have_content 'Work items 0'
     end
 
     it 'shows link to browse and add issues' do
@@ -89,15 +87,15 @@ RSpec.describe 'Project milestone', :js, feature_category: :team_planning do
       visit project_milestone_path(project, milestone)
     end
 
-    it 'does not show any issues under the issues tab' do
+    it 'does not show any work items under the work items tab' do
       within('#content-body') do
-        expect(find(active_tab_selector)).to have_content 'Issues'
+        expect(find(active_tab_selector)).to have_content 'Work items'
         expect(page).not_to have_selector '.issuable-row'
       end
     end
 
-    it 'hides issues stats' do
-      expect(find('.milestone-sidebar')).not_to have_content 'Issues 0'
+    it 'hides work items stats' do
+      expect(find('.milestone-sidebar')).not_to have_content 'Work items 0'
     end
 
     it 'hides new issue button' do
diff --git a/spec/frontend/admin/groups/index/components/app_spec.js b/spec/frontend/admin/groups/index/components/app_spec.js
index c0789d70452..38e7b526ebc 100644
--- a/spec/frontend/admin/groups/index/components/app_spec.js
+++ b/spec/frontend/admin/groups/index/components/app_spec.js
@@ -10,7 +10,9 @@ import {
   FILTERED_SEARCH_TERM_KEY,
   FILTERED_SEARCH_NAMESPACE,
   ADMIN_GROUPS_TABS,
+  FIRST_TAB_ROUTE_NAMES,
 } from '~/admin/groups/index/constants';
+import adminGroupCountsQuery from '~/admin/groups/index/graphql/queries/group_counts.query.graphql';
 import {
   TIMESTAMP_TYPE_CREATED_AT,
   TIMESTAMP_TYPE_UPDATED_AT,
@@ -43,6 +45,9 @@ describe('AdminGroupsApp', () => {
       initialSort: '',
       shouldUpdateActiveTabCountFromTabQuery: true,
       paginationType: PAGINATION_TYPE_KEYSET,
+      tabCountsQuery: adminGroupCountsQuery,
+      tabCountsQueryErrorMessage: 'An error occurred loading the group counts.',
+      firstTabRouteNames: FIRST_TAB_ROUTE_NAMES,
     });
   });
 });
diff --git a/spec/frontend/boards/board_list_spec.js b/spec/frontend/boards/board_list_spec.js
index 5e9bfdd4aad..8947be283ae 100644
--- a/spec/frontend/boards/board_list_spec.js
+++ b/spec/frontend/boards/board_list_spec.js
@@ -3,11 +3,15 @@ import Draggable from 'vuedraggable';
 import { nextTick } from 'vue';
 import { DraggableItemTypes, ListType, WIP_ITEMS, WIP_WEIGHT } from 'ee_else_ce/boards/constants';
 import { DETAIL_VIEW_QUERY_PARAM_NAME, WORK_ITEM_TYPE_ENUM_ISSUE } from '~/work_items/constants';
+import { TYPE_ISSUE, WORKSPACE_PROJECT } from '~/issues/constants';
+import * as cacheUpdates from '~/boards/graphql/cache_updates';
 import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame';
+import issueCreateMutation from '~/boards/graphql/issue_create.mutation.graphql';
 import waitForPromises from 'helpers/wait_for_promises';
 import createComponent from 'jest/boards/board_list_helper';
 import { ESC_KEY_CODE } from '~/lib/utils/keycodes';
 import BoardCard from '~/boards/components/board_card.vue';
+import BoardNewIssue from '~/boards/components/board_new_issue.vue';
 import BoardCutLine from '~/boards/components/board_cut_line.vue';
 import BoardCardMoveToPosition from '~/boards/components/board_card_move_to_position.vue';
 import listIssuesQuery from '~/boards/graphql/lists_issues.query.graphql';
@@ -28,6 +32,7 @@ describe('Board list component', () => {
   const findIntersectionObserver = () => wrapper.findComponent(GlIntersectionObserver);
   const findBoardListCount = () => wrapper.find('.board-list-count');
   const findBoardCardButtons = () => wrapper.findAll('a.board-card-button');
+  const queryHandlerFailure = jest.fn().mockRejectedValue(new Error('error'));
 
   const maxIssueWeightOrCountWarningClass = '.gl-bg-red-50';
 
@@ -364,6 +369,42 @@ describe('Board list component', () => {
     });
   });
 
+  it('does not set active board item when add new list item results in error', async () => {
+    const listResolver = jest.fn().mockResolvedValue(mockGroupIssuesResponse());
+    const mutationHandler = jest.fn();
+    cacheUpdates.setError = jest.fn();
+    wrapper = createComponent({
+      componentProps: { showNewForm: true },
+      provide: {
+        boardType: WORKSPACE_PROJECT,
+        issuableType: TYPE_ISSUE,
+        isProjectBoard: true,
+        isGroupBoard: false,
+        isEpicBoard: false,
+      },
+      apolloQueryHandlers: [
+        [listIssuesQuery, listResolver],
+        [issueCreateMutation, queryHandlerFailure],
+      ],
+      apolloResolvers: {
+        Mutation: {
+          setActiveBoardItem: mutationHandler,
+        },
+      },
+      stubs: {
+        BoardNewIssue,
+      },
+    });
+
+    expect(wrapper.findComponent(BoardNewIssue).exists()).toBe(true);
+    wrapper.findComponent(BoardNewIssue).vm.$emit('addNewIssue', { title: 'Foo' });
+
+    await waitForPromises();
+
+    expect(cacheUpdates.setError).toHaveBeenCalled();
+    expect(mutationHandler).not.toHaveBeenCalled();
+  });
+
   describe('when the URL contains a `show` parameter', () => {
     const mutationHandler = jest.fn();
     const listResolver = jest.fn().mockResolvedValue(mockGroupIssuesResponse());
diff --git a/spec/frontend/deployments/components/deployment_aside_spec.js b/spec/frontend/deployments/components/deployment_aside_spec.js
index 4ec30b6bbc5..978817e70a4 100644
--- a/spec/frontend/deployments/components/deployment_aside_spec.js
+++ b/spec/frontend/deployments/components/deployment_aside_spec.js
@@ -1,4 +1,5 @@
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
+import { GlLink } from '@gitlab/ui';
 import { nextTick } from 'vue';
 import mockDeploymentFixture from 'test_fixtures/graphql/deployments/graphql/queries/deployment.query.graphql.json';
 import mockEnvironmentFixture from 'test_fixtures/graphql/deployments/graphql/queries/environment.query.graphql.json';
@@ -64,7 +65,7 @@ describe('~/deployments/components/deployment_aside.vue', () => {
     });
 
     it('shows a link to the triggerer', () => {
-      const link = wrapper.findByTestId('deployment-triggerer');
+      const link = wrapper.findByTestId('deployment-triggerer').findComponent(GlLink);
 
       expect(link.attributes('href')).toBe(deployment.triggerer.webUrl);
       expect(link.text()).toContain(deployment.triggerer.name);
diff --git a/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_agent_info_spec.js b/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_agent_info_spec.js
index 1d80b415dda..6359ec580c1 100644
--- a/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_agent_info_spec.js
+++ b/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_agent_info_spec.js
@@ -1,15 +1,24 @@
 import { shallowMount } from '@vue/test-utils';
-import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlIcon, GlLink, GlSprintf, GlButton } from '@gitlab/ui';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import ConnectToAgentModal from '~/clusters_list/components/connect_to_agent_modal.vue';
 import KubernetesAgentInfo from '~/environments/environment_details/components/kubernetes/kubernetes_agent_info.vue';
-import { AGENT_STATUSES, ACTIVE_CONNECTION_TIME } from '~/clusters_list/constants';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
+import {
+  AGENT_STATUSES,
+  ACTIVE_CONNECTION_TIME,
+  CONNECT_MODAL_ID,
+} from '~/clusters_list/constants';
 import waitForPromises from 'helpers/wait_for_promises';
 
 const defaultClusterAgent = {
   name: 'my-agent',
   id: 'gid://gitlab/ClusterAgent/1',
   webPath: 'path/to/agent-page',
+  project: {
+    fullPath: 'gitlab-org/gitlab',
+  },
 };
 
 const connectedTimeNow = new Date();
@@ -22,12 +31,17 @@ describe('~/environments/environment_details/components/kubernetes/kubernetes_ag
   const findAgentStatus = () => wrapper.findByTestId('agent-status');
   const findAgentStatusIcon = () => findAgentStatus().findComponent(GlIcon);
   const findAgentLastUsedDate = () => wrapper.findByTestId('agent-last-used-date');
+  const findConnectButton = () => wrapper.findComponent(GlButton);
+  const findConnectModal = () => wrapper.findComponent(ConnectToAgentModal);
 
-  const createWrapper = ({ tokens = [] } = {}) => {
+  const createWrapper = ({ tokens = [], clusterAgent = defaultClusterAgent } = {}) => {
     wrapper = extendedWrapper(
       shallowMount(KubernetesAgentInfo, {
-        propsData: { clusterAgent: { ...defaultClusterAgent, tokens: { nodes: tokens } } },
+        propsData: { clusterAgent: { ...clusterAgent, tokens: { nodes: tokens } } },
         stubs: { TimeAgoTooltip, GlSprintf },
+        directives: {
+          GlModalDirective: createMockDirective('gl-modal-directive'),
+        },
       }),
     );
   };
@@ -41,6 +55,24 @@ describe('~/environments/environment_details/components/kubernetes/kubernetes_ag
       expect(findAgentLink().attributes('href')).toBe(defaultClusterAgent.webPath);
       expect(findAgentLink().text()).toContain('1');
     });
+
+    it('renders the connect to agent button', () => {
+      expect(findConnectButton().text()).toBe('Connect to agent');
+    });
+
+    it('renders the connect to agent modal with correct props', () => {
+      expect(findConnectModal().props()).toMatchObject({
+        agentId: defaultClusterAgent.id,
+        projectPath: 'gitlab-org/gitlab',
+        isConfigured: true,
+      });
+    });
+
+    it('connect button has modal directive', () => {
+      const binding = getBinding(findConnectButton().element, 'gl-modal-directive');
+
+      expect(binding.value).toBe(CONNECT_MODAL_ID);
+    });
   });
 
   describe.each`
diff --git a/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_overview_spec.js b/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_overview_spec.js
index d02e5e3efe2..f454dd911fb 100644
--- a/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_overview_spec.js
+++ b/spec/frontend/environments/environment_details/components/kubernetes/kubernetes_overview_spec.js
@@ -1,12 +1,6 @@
 import Vue, { nextTick } from 'vue';
 import VueApollo from 'vue-apollo';
-import {
-  GlEmptyState,
-  GlAlert,
-  GlSprintf,
-  GlDisclosureDropdown,
-  GlDisclosureDropdownItem,
-} from '@gitlab/ui';
+import { GlEmptyState, GlAlert, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import waitForPromises from 'helpers/wait_for_promises';
 import { stubComponent } from 'helpers/stub_component';
@@ -14,7 +8,6 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import { useMockInternalEventsTracking } from 'helpers/tracking_internal_events_helper';
 import { createAlert } from '~/alert';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import WorkloadDetailsDrawer from '~/kubernetes_dashboard/components/workload_details_drawer.vue';
 import KubernetesOverview from '~/environments/environment_details/components/kubernetes/kubernetes_overview.vue';
 import KubernetesStatusBar from '~/environments/environment_details/components/kubernetes/kubernetes_status_bar.vue';
@@ -22,9 +15,7 @@ import KubernetesAgentInfo from '~/environments/environment_details/components/k
 import KubernetesTabs from '~/environments/environment_details/components/kubernetes/kubernetes_tabs.vue';
 import DeletePodModal from '~/environments/environment_details/components/kubernetes/delete_pod_modal.vue';
 import { k8sResourceType } from '~/environments/graphql/resolvers/kubernetes/constants';
-import ConnectToAgentModal from '~/clusters_list/components/connect_to_agent_modal.vue';
 import { mockPodsTableItems } from 'jest/kubernetes_dashboard/graphql/mock_data';
-import { CONNECT_MODAL_ID } from '~/clusters_list/constants';
 import {
   FLUX_RECONCILE_ACTION,
   FLUX_SUSPEND_ACTION,
@@ -103,9 +94,6 @@ describe('~/environments/environment_details/components/kubernetes/kubernetes_ov
           methods: { toggle: toggleDetailsDrawerSpy, close: closeDetailsDrawerSpy },
         }),
       },
-      directives: {
-        GlModalDirective: createMockDirective('gl-modal-directive'),
-      },
     });
   };
 
@@ -116,9 +104,6 @@ describe('~/environments/environment_details/components/kubernetes/kubernetes_ov
   const findAlert = () => wrapper.findComponent(GlAlert);
   const findWorkloadDetailsDrawer = () => wrapper.findComponent(WorkloadDetailsDrawer);
   const findDeletePodModal = () => wrapper.findComponent(DeletePodModal);
-  const findDisclosureDropdown = () => wrapper.findComponent(GlDisclosureDropdown);
-  const findDisclosureDropdownItem = () => wrapper.findComponent(GlDisclosureDropdownItem);
-  const findConnectModal = () => wrapper.findComponent(ConnectToAgentModal);
 
   const itemHasAction = (action) => {
     const { lastCall } = toggleDetailsDrawerSpy.mock;
@@ -166,34 +151,6 @@ describe('~/environments/environment_details/components/kubernetes/kubernetes_ov
       });
     });
 
-    describe('actions menu', () => {
-      beforeEach(() => {
-        wrapper = createWrapper();
-      });
-
-      it('renders dropdown for the actions', () => {
-        expect(findDisclosureDropdown().attributes('title')).toBe('Actions');
-      });
-
-      it('renders dropdown item for connecting to cluster action', () => {
-        expect(findDisclosureDropdownItem().text()).toBe('Connect to agent');
-      });
-
-      it('binds dropdown item to the proper modal', () => {
-        const binding = getBinding(findDisclosureDropdownItem().element, 'gl-modal-directive');
-
-        expect(binding.value).toBe(CONNECT_MODAL_ID);
-      });
-
-      it('renders connect to agent modal', () => {
-        expect(findConnectModal().props()).toEqual({
-          agentId: 'gid://gitlab/ClusterAgent/1',
-          projectPath: 'path/to/agent/project',
-          isConfigured: true,
-        });
-      });
-    });
-
     describe('Kubernetes health status', () => {
       beforeEach(() => {
         wrapper = createWrapper();
diff --git a/spec/frontend/environments/environment_details/components/kubernetes/pod_logs_button_spec.js b/spec/frontend/environments/environment_details/components/kubernetes/pod_logs_button_spec.js
index 75e5802046f..b54ce89a66a 100644
--- a/spec/frontend/environments/environment_details/components/kubernetes/pod_logs_button_spec.js
+++ b/spec/frontend/environments/environment_details/components/kubernetes/pod_logs_button_spec.js
@@ -34,6 +34,10 @@ describe('~/environments/environment_details/components/kubernetes/pod_logs_butt
         expect(findButton().text()).toBe('View logs');
       });
 
+      it('renders a button with the correct icon', () => {
+        expect(findButton().props('icon')).toBe('log');
+      });
+
       it('provides link to the logs page', () => {
         expect(findButton().attributes('to')).toBe(
           `/k8s/namespace/${namespace}/pods/${podName}/logs?container=${container.name}`,
@@ -50,6 +54,10 @@ describe('~/environments/environment_details/components/kubernetes/pod_logs_butt
         expect(findDropdown().props('toggleText')).toBe('View logs');
       });
 
+      it('renders a dropdown with the correct icon', () => {
+        expect(findDropdown().props('icon')).toBe('log');
+      });
+
       it('provides correct dropdown items', () => {
         expect(findDropdown().props('items')).toEqual([
           {
diff --git a/spec/frontend/import_entities/import_groups/components/import_table_spec.js b/spec/frontend/import_entities/import_groups/components/import_table_spec.js
index 100a74318ee..f3214f0fe41 100644
--- a/spec/frontend/import_entities/import_groups/components/import_table_spec.js
+++ b/spec/frontend/import_entities/import_groups/components/import_table_spec.js
@@ -565,24 +565,6 @@ describe('import table', () => {
         expect.anything(),
       );
     });
-
-    it('updates status text when page is changed', async () => {
-      const REQUESTED_PAGE = 2;
-      bulkImportSourceGroupsQueryMock.mockResolvedValue({
-        nodes: [FAKE_GROUP],
-        pageInfo: {
-          page: 2,
-          total: 38,
-          perPage: 20,
-          totalPages: 2,
-        },
-        versionValidation: FAKE_VERSION_VALIDATION,
-      });
-      wrapper.findComponent(PaginationLinks).props().change(REQUESTED_PAGE);
-      await waitForPromises();
-
-      expect(wrapper.text()).toContain('Showing 21-21 of 38 groups that you own from');
-    });
   });
 
   describe('filters', () => {
@@ -623,21 +605,6 @@ describe('import table', () => {
       );
     });
 
-    it('updates status string when search box is submitted', async () => {
-      createComponent({
-        bulkImportSourceGroups: bulkImportSourceGroupsQueryMock,
-      });
-      await waitForPromises();
-
-      const FILTER_VALUE = 'foo';
-      await setFilter(FILTER_VALUE);
-      await waitForPromises();
-
-      expect(wrapper.text()).toContain(
-        'Showing 1-1 of 40 groups that you own matching filter "foo" from',
-      );
-    });
-
     it('properly resets filter in graphql query when search box is cleared', async () => {
       const FILTER_VALUE = 'foo';
       await setFilter(FILTER_VALUE);
diff --git a/spec/frontend/kubernetes_dashboard/components/workload_table_spec.js b/spec/frontend/kubernetes_dashboard/components/workload_table_spec.js
index 9543acf7ce4..822958c53cd 100644
--- a/spec/frontend/kubernetes_dashboard/components/workload_table_spec.js
+++ b/spec/frontend/kubernetes_dashboard/components/workload_table_spec.js
@@ -1,5 +1,5 @@
 import { mount, shallowMount } from '@vue/test-utils';
-import { GlTable, GlBadge, GlPagination, GlDisclosureDropdown, GlButton } from '@gitlab/ui';
+import { GlTable, GlBadge, GlPagination, GlButton } from '@gitlab/ui';
 import { nextTick } from 'vue';
 import { cloneDeep } from 'lodash';
 import { stubComponent } from 'helpers/stub_component';
@@ -35,7 +35,7 @@ const findAllBadges = () => wrapper.findAllComponents(GlBadge);
 const findBadge = (at) => findAllBadges().at(at);
 const findPagination = () => wrapper.findComponent(GlPagination);
 const findAllPodLogsButtons = () => wrapper.findAllComponents(PodLogsButton);
-const findAllActionsDropdowns = () => wrapper.findAllComponents(GlDisclosureDropdown);
+const findAllActionButtons = () => wrapper.findAll('[data-testid="delete-action-button"]');
 const findAllPodNameButtons = () => wrapper.findAllComponents(GlButton);
 
 describe('Workload table component', () => {
@@ -112,7 +112,7 @@ describe('Workload table component', () => {
         createWrapper({ items: itemsWithContainers, fields: PODS_TABLE_FIELDS });
       });
 
-      it('renders pod-logs-button for each pod with containers', () => {
+      it('renders pod-logs-button in actions column for each pod with containers', () => {
         expect(findAllPodLogsButtons()).toHaveLength(1);
       });
 
@@ -131,6 +131,7 @@ describe('Workload table component', () => {
         {
           name: 'delete-pod',
           text: 'Delete Pod',
+          class: 'text-danger',
         },
       ];
       const podItemsWithActions = mockPodsTableItems.map((item) => {
@@ -145,25 +146,32 @@ describe('Workload table component', () => {
         createWrapper({ items: podItemsWithActions, fields: PODS_TABLE_FIELDS });
       });
 
-      it('renders actions column', () => {
+      it('renders actions column with proper label', () => {
         expect(findTable().props('fields')[lastField]).toEqual({
           key: 'actions',
-          label: '',
+          label: 'Actions',
           sortable: false,
         });
       });
 
-      it('renders actions dropdown for each row', () => {
-        expect(findAllActionsDropdowns()).toHaveLength(podItemsWithActions.length);
+      it('renders delete button for items with delete-pod action', () => {
+        expect(findAllActionButtons()).toHaveLength(podItemsWithActions.length);
       });
 
-      it('renders correct props for each dropdown', () => {
-        expect(findAllActionsDropdowns().at(0).attributes('title')).toBe('Actions');
-        expect(findAllActionsDropdowns().at(0).props('items')).toMatchObject([
-          {
-            text: 'Delete Pod',
-          },
-        ]);
+      it('renders delete button with correct props', () => {
+        expect(findAllActionButtons().at(0).props()).toMatchObject({
+          icon: 'remove',
+          size: 'small',
+          variant: 'danger',
+          category: 'tertiary',
+        });
+      });
+
+      it('emits delete-pod event when delete button is clicked', async () => {
+        await findAllActionButtons().at(0).trigger('click');
+
+        expect(wrapper.emitted('delete-pod')).toHaveLength(1);
+        expect(wrapper.emitted('delete-pod')[0]).toEqual([podItemsWithActions[0]]);
       });
     });
   });
diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
index 52355806487..49f27fd6901 100644
--- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
@@ -28,7 +28,7 @@ describe('AssigneeAvatarLink component', () => {
   it('has the root url present in the assigneeUrl method', () => {
     createComponent();
 
-    expect(wrapper.attributes().href).toEqual(userDataMock().web_url);
+    expect(wrapper.findComponent(GlLink).attributes().href).toEqual(userDataMock().web_url);
   });
 
   it('renders assignee avatar', () => {
diff --git a/spec/frontend/sidebar/components/assignees/assignees_spec.js b/spec/frontend/sidebar/components/assignees/assignees_spec.js
index 099f03eae90..7c6642402a4 100644
--- a/spec/frontend/sidebar/components/assignees/assignees_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignees_spec.js
@@ -1,4 +1,4 @@
-import { GlAvatar, GlIcon } from '@gitlab/ui';
+import { GlAvatar, GlIcon, GlLink } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import { trimText } from 'helpers/text_helper';
 import UsersMockHelper from 'helpers/user_mock_data_helper';
@@ -7,6 +7,8 @@ import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_l
 import CollapsedAssigneeList from '~/sidebar/components/assignees/collapsed_assignee_list.vue';
 import UsersMock from '../../mock_data';
 
+jest.mock('lodash/uniqueId', () => (x) => `${x}1`);
+
 describe('Assignee component', () => {
   const getDefaultProps = () => ({
     rootPath: 'http://localhost:3000',
@@ -182,6 +184,11 @@ describe('Assignee component', () => {
 
       expect(userItems).toHaveLength(3);
       expect(userItems.at(0).attributes()).toMatchObject({
+        class: 'gl-inline-block gl-break-anywhere',
+        id: 'user-popover-1',
+      });
+
+      expect(userItems.at(0).findComponent(GlLink).attributes()).toMatchObject({
         'data-user-id': `${users[2].id}`,
         'data-username': users[2].username,
       });
diff --git a/spec/frontend/work_items/components/work_item_change_type_modal_spec.js b/spec/frontend/work_items/components/work_item_change_type_modal_spec.js
index 5c2fb7e2ab9..586a1e6b961 100644
--- a/spec/frontend/work_items/components/work_item_change_type_modal_spec.js
+++ b/spec/frontend/work_items/components/work_item_change_type_modal_spec.js
@@ -73,7 +73,6 @@ describe('WorkItemChangeTypeModal component', () => {
   const createComponent = ({
     hasParent = false,
     hasChildren = false,
-    workItemEpicMilestones = false,
     widgets = [],
     workItemType = WORK_ITEM_TYPE_NAME_TASK,
     convertWorkItemMutationHandler = convertWorkItemMutationSuccessHandler,
@@ -99,9 +98,6 @@ describe('WorkItemChangeTypeModal component', () => {
         allowedConversionTypesEE,
       },
       provide: {
-        glFeatures: {
-          workItemEpicMilestones,
-        },
         hasSubepicsFeature,
       },
       stubs: {
@@ -232,7 +228,6 @@ describe('WorkItemChangeTypeModal component', () => {
       createComponent({
         workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
         widgets: [workItemChangeTypeWidgets.MILESTONE],
-        workItemEpicMilestones: true,
         allowedConversionTypesEE,
       });
 
diff --git a/spec/frontend/work_items/list/components/work_items_list_app_spec.js b/spec/frontend/work_items/list/components/work_items_list_app_spec.js
index f2c6a0b05e3..7c5344c186f 100644
--- a/spec/frontend/work_items/list/components/work_items_list_app_spec.js
+++ b/spec/frontend/work_items/list/components/work_items_list_app_spec.js
@@ -320,63 +320,29 @@ describeSkipVue3(skipReason, () => {
     });
 
     describe('when epics list', () => {
-      describe('when workItemEpicMilestones is disabled', () => {
-        it('does not render "Priority", "Milestone due date", "Label priority", and "Weight" sort options', async () => {
-          mountComponent({
-            provide: {
-              glFeatures: {
-                workItemEpicMilestones: false,
-              },
-              hasBlockedIssuesFeature: true,
-              hasIssuableHealthStatusFeature: true,
-              hasIssueWeightsFeature: true,
-              workItemType: WORK_ITEM_TYPE_NAME_EPIC,
-            },
-          });
-          await waitForPromises();
-
-          expect(findIssuableList().props('sortOptions')).toEqual([
-            expect.objectContaining({ title: 'Created date' }),
-            expect.objectContaining({ title: 'Updated date' }),
-            expect.objectContaining({ title: 'Closed date' }),
-            expect.objectContaining({ title: 'Due date' }),
-            expect.objectContaining({ title: 'Popularity' }),
-            expect.objectContaining({ title: 'Title' }),
-            expect.objectContaining({ title: 'Start date' }),
-            expect.objectContaining({ title: 'Health' }),
-            expect.objectContaining({ title: 'Blocking' }),
-          ]);
+      it('does not render "Priority", "Label priority", and "Weight" sort options', async () => {
+        mountComponent({
+          provide: {
+            hasBlockedIssuesFeature: true,
+            hasIssuableHealthStatusFeature: true,
+            hasIssueWeightsFeature: true,
+            workItemType: WORK_ITEM_TYPE_NAME_EPIC,
+          },
         });
-      });
+        await waitForPromises();
 
-      describe('when workItemEpicMilestones is enabled', () => {
-        it('does not render "Priority", "Label priority", and "Weight" sort options', async () => {
-          mountComponent({
-            provide: {
-              glFeatures: {
-                workItemEpicMilestones: true,
-              },
-              hasBlockedIssuesFeature: true,
-              hasIssuableHealthStatusFeature: true,
-              hasIssueWeightsFeature: true,
-              workItemType: WORK_ITEM_TYPE_NAME_EPIC,
-            },
-          });
-          await waitForPromises();
-
-          expect(findIssuableList().props('sortOptions')).toEqual([
-            expect.objectContaining({ title: 'Created date' }),
-            expect.objectContaining({ title: 'Updated date' }),
-            expect.objectContaining({ title: 'Closed date' }),
-            expect.objectContaining({ title: 'Milestone due date' }),
-            expect.objectContaining({ title: 'Due date' }),
-            expect.objectContaining({ title: 'Popularity' }),
-            expect.objectContaining({ title: 'Title' }),
-            expect.objectContaining({ title: 'Start date' }),
-            expect.objectContaining({ title: 'Health' }),
-            expect.objectContaining({ title: 'Blocking' }),
-          ]);
-        });
+        expect(findIssuableList().props('sortOptions')).toEqual([
+          expect.objectContaining({ title: 'Created date' }),
+          expect.objectContaining({ title: 'Updated date' }),
+          expect.objectContaining({ title: 'Closed date' }),
+          expect.objectContaining({ title: 'Milestone due date' }),
+          expect.objectContaining({ title: 'Due date' }),
+          expect.objectContaining({ title: 'Popularity' }),
+          expect.objectContaining({ title: 'Title' }),
+          expect.objectContaining({ title: 'Start date' }),
+          expect.objectContaining({ title: 'Health' }),
+          expect.objectContaining({ title: 'Blocking' }),
+        ]);
       });
     });
   });
diff --git a/spec/models/concerns/milestoneish_spec.rb b/spec/models/concerns/milestoneish_spec.rb
index 8a961649272..60dc60c54db 100644
--- a/spec/models/concerns/milestoneish_spec.rb
+++ b/spec/models/concerns/milestoneish_spec.rb
@@ -28,7 +28,6 @@ RSpec.describe Milestone, 'Milestoneish', factory_default: :keep do
   before do
     project.add_developer(member)
     project.add_guest(guest)
-    stub_feature_flags(work_item_epic_milestones: false)
   end
 
   describe '#sorted_issues' do
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 793d0340829..b2e64216544 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -678,7 +678,8 @@ RSpec.describe ProjectPresenter do
               "original_branch" => "master",
               "path" => "/#{project.full_path}/-/create/master",
               "project_path" => project.full_path,
-              "target_branch" => "master"
+              "target_branch" => "master",
+              "full_name" => project.name_with_namespace
             }
           )
         end
diff --git a/spec/support/shared_examples/security/creating_merge_request_approval_policy_shared_examples.rb b/spec/support/shared_examples/security/creating_merge_request_approval_policy_shared_examples.rb
new file mode 100644
index 00000000000..d31de4b8385
--- /dev/null
+++ b/spec/support/shared_examples/security/creating_merge_request_approval_policy_shared_examples.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+# Requires the url to the policy editor:
+# - path_to_policy_editor
+RSpec.shared_examples 'creating merge request approval policy with valid properties' do
+  include ListboxHelpers
+
+  before do
+    stub_licensed_features(security_orchestration_policies: true)
+    visit(path_to_policy_editor)
+    within_testid("approval_policy-card") do
+      click_link _('Select policy')
+    end
+  end
+
+  it "can create a policy when a policy project exists" do
+    fill_in _('Name'), with: 'Prevent vulnerabilities'
+    click_button _('Select scan type')
+    select_listbox_item _('Security Scan')
+    within_testid('disabled-actions') do
+      click_button _('Remove'), match: :first
+    end
+    click_button _('Configure with a merge request')
+    expect(page).to have_current_path(project_merge_request_path(policy_management_project, 1))
+  end
+end
+
+# Requires the url to the policy editor:
+# - path_to_policy_editor
+RSpec.shared_examples 'creating merge request approval policy with invalid properties' do
+  include ListboxHelpers
+  include Features::SourceEditorSpecHelpers
+
+  let(:path_to_merge_request_approval_policy_editor) { "#{path_to_policy_editor}?type=approval_policy" }
+  let(:merge_request_approval_policy_with_exceeding_number_of_rules) do
+    fixture_file('security_orchestration/merge_request_approval_policy_with_exceeding_number_of_rules.yml', dir: 'ee')
+  end
+
+  before do
+    stub_licensed_features(security_orchestration_policies: true)
+    visit(path_to_policy_editor)
+    within_testid("approval_policy-card") do
+      click_link _('Select policy')
+    end
+  end
+
+  it "fails to create a policy without name" do
+    click_button _('Configure with a merge request')
+
+    expect(page).to have_content('Empty policy name')
+    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
+  end
+
+  it "fails to create a policy without approvers" do
+    fill_in _('Name'), with: 'Missing approvers'
+    click_button _('Configure with a merge request')
+
+    expect(page).to have_content('Required approvals exceed eligible approvers.')
+    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
+  end
+
+  it "fails to create a policy when user has an incompatible role" do
+    fill_in _('Name'), with: 'Missing approvers'
+
+    page.within(find_by_testid('disabled-actions')) do
+      select_from_listbox 'Roles', from: 'Choose approver type'
+    end
+
+    click_button _('Configure with a merge request')
+
+    expect(page).to have_content('Required approvals exceed eligible approvers.')
+    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
+  end
+
+  it "fails to create a policy without rules" do
+    fill_in _('Name'), with: 'Missing rules'
+
+    page.within(find_by_testid('disabled-actions')) do
+      select_from_listbox 'Roles', from: 'Choose approver type'
+      select_from_listbox 'Owner', from: 'Choose specific role'
+    end
+
+    click_button _('Configure with a merge request')
+
+    expect(page).to have_content("Invalid policy YAML")
+    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
+  end
+
+  it "fails to create policy with exceeding number of rules" do
+    click_button _('.yaml mode')
+    editor_set_value(merge_request_approval_policy_with_exceeding_number_of_rules.to_s)
+
+    click_button _('Configure with a merge request')
+
+    expect(page).to have_content("Invalid policy YAML")
+    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
+  end
+end
diff --git a/spec/support/shared_examples/security/editing_merge_request_approval_policy_shared_examples.rb b/spec/support/shared_examples/security/editing_merge_request_approval_policy_shared_examples.rb
new file mode 100644
index 00000000000..a22c99cf4bc
--- /dev/null
+++ b/spec/support/shared_examples/security/editing_merge_request_approval_policy_shared_examples.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# Requires the url to the policy editor:
+# - user to be logged in with the correct permissions
+# - the page to be the policy editor
+RSpec.shared_examples 'editing merge request approval policy with invalid properties' do
+  before do
+    allow_next_found_instance_of(Security::OrchestrationPolicyConfiguration) do |policy|
+      allow(policy).to receive_messages(policy_configuration_valid?: true, policy_hash: policy_yaml,
+        policy_last_updated_at: Time.current)
+    end
+
+    sign_in(owner)
+    stub_licensed_features(security_orchestration_policies: true)
+    visit(policy_path)
+  end
+
+  it "fails to save existing policy without name field" do
+    within_testid('policies-list') do
+      find_by_testid('base-dropdown-toggle', match: :first).click
+      click_link 'Edit'
+    end
+
+    fill_in _('Name'), with: ''
+
+    click_button _('Update via merge request')
+
+    expect(page).to have_content('Empty policy name')
+  end
+end
diff --git a/spec/support/shared_examples/security/policies_shared_examples.rb b/spec/support/shared_examples/security/policies_shared_examples.rb
index 06f82bcf99f..276e98d8385 100644
--- a/spec/support/shared_examples/security/policies_shared_examples.rb
+++ b/spec/support/shared_examples/security/policies_shared_examples.rb
@@ -22,75 +22,3 @@ RSpec.shared_examples 'policies list' do
     expect(page).to have_content 'critical vulnerability CS approvals'
   end
 end
-
-# Requires the url to the policy editor:
-# - path_to_policy_editor
-RSpec.shared_examples 'merge request approval policy editor' do
-  before do
-    sign_in(owner)
-    stub_licensed_features(security_orchestration_policies: true)
-  end
-
-  it "can create a policy when a policy project exists" do
-    visit(path_to_policy_editor)
-    within_testid("approval_policy-card") do
-      click_link _('Select policy')
-    end
-    fill_in _('Name'), with: 'Prevent vulnerabilities'
-    click_button _('Select scan type')
-    select_listbox_item _('Security Scan')
-    within_testid('disabled-actions') do
-      click_button _('Remove'), match: :first
-    end
-    click_button _('Configure with a merge request')
-    expect(page).to have_current_path(project_merge_request_path(policy_management_project, 1))
-  end
-end
-
-# Requires the url to the policy editor:
-# - path_to_merge_request_approval_policy_editor
-# - path_to_merge_request_approval_policy_editor
-RSpec.shared_examples 'merge request approval policy invalid policy properties' do
-  let(:merge_request_approval_policy_with_exceeding_number_of_rules) do
-    fixture_file('security_orchestration/merge_request_approval_policy_with_exceeding_number_of_rules.yml', dir: 'ee')
-  end
-
-  it "fails to create a policy without name" do
-    click_button _('Configure with a merge request')
-
-    expect(page).to have_content('Empty policy name')
-    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
-  end
-
-  it "fails to create a policy without approvers" do
-    fill_in _('Name'), with: 'Missing approvers'
-    click_button _('Configure with a merge request')
-
-    expect(page).to have_content('Required approvals exceed eligible approvers.')
-    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
-  end
-
-  it "fails to create a policy without rules" do
-    fill_in _('Name'), with: 'Missing rules'
-
-    page.within(find_by_testid('disabled-actions')) do
-      select_from_listbox 'Roles', from: 'Choose approver type'
-      select_from_listbox 'Owner', from: 'Choose specific role'
-    end
-
-    click_button _('Configure with a merge request')
-
-    expect(page).to have_content("Invalid policy YAML")
-    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
-  end
-
-  it "fails to create policy with exceeding number of rules" do
-    click_button _('.yaml mode')
-    editor_set_value(merge_request_approval_policy_with_exceeding_number_of_rules.to_s)
-
-    click_button _('Configure with a merge request')
-
-    expect(page).to have_content("Invalid policy YAML")
-    expect(page).to have_current_path(path_to_merge_request_approval_policy_editor)
-  end
-end