diff --git a/.gitlab/issue_templates/Operational Readiness.md b/.gitlab/issue_templates/Operational Readiness.md
index 9a424b7c615..68575b9b4a3 100644
--- a/.gitlab/issue_templates/Operational Readiness.md	
+++ b/.gitlab/issue_templates/Operational Readiness.md	
@@ -105,7 +105,7 @@ Complete common and the appropriate checklists per the type of new component men
 ### New data store, third party dependency
 
 - [ ] Legal and Security
-  - [ ] What is the [classification](https://about.gitlab.com/handbook/security/data-classification-standard.html#data-classification-levels) of data stored in the data store?
+  - [ ] What is the [classification](https://handbook.gitlab.com/handbook/security/data-classification-standard/#data-classification-levels) of data stored in the data store?
   - [ ] Have they got any security standards to meet our and/or our customers' requirements? (i.e. FIPS and/or Fed-RAMP) If not, what needs to be done?
 - [ ] Development, Testing, Deployment, and Operation
   - [ ] What integration types do they provide, e.g. SaaS and/or self-hosting?
diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index 64d019e35d5..5c6166f54b6 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-2b6ddffe03cec87d2ad017a44cb8ea854e4a9200
+2c3d376351199588c5e6e1c17feb97a7d800f579
diff --git a/Gemfile.checksum b/Gemfile.checksum
index fc06f0f368e..962075e4bcf 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -218,7 +218,7 @@
 {"name":"gitaly","version":"17.8.4","platform":"ruby","checksum":"196d9735a83f8a7d396baa216b979eb0c801622d8b7573f90010338d5b0c7b4f"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
 {"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"},
-{"name":"gitlab-cloud-connector","version":"1.11.0","platform":"ruby","checksum":"fb131bb3d04a7d014a08311cd7ff669ed3c5577d9d0b11df7216f768dfd5c0c8"},
+{"name":"gitlab-cloud-connector","version":"1.12.0","platform":"ruby","checksum":"b1eb7b0f5cb6633929681904d92771b387ec126b02319cd6cb62dd04bd5750af"},
 {"name":"gitlab-crystalball","version":"0.7.2","platform":"ruby","checksum":"c4ed7871d5952377ba38dedc2d64febc204273b5a7d98c954b777b4a9aceb49a"},
 {"name":"gitlab-dangerfiles","version":"4.9.1","platform":"ruby","checksum":"296b19d8aca5e4da8d391234914a1c4dfedc29700ddbcd9c554b6ffaa7fdf1b2"},
 {"name":"gitlab-experiment","version":"0.9.1","platform":"ruby","checksum":"f230ee742154805a755d5f2539dc44d93cdff08c5bbbb7656018d61f93d01f48"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 96a0854f3a8..e3ceaf40e89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -748,7 +748,7 @@ GEM
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.11.0)
+    gitlab-cloud-connector (1.12.0)
       activesupport (~> 7.0)
       jwt (~> 2.9.3)
     gitlab-crystalball (0.7.2)
diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum
index fc06f0f368e..962075e4bcf 100644
--- a/Gemfile.next.checksum
+++ b/Gemfile.next.checksum
@@ -218,7 +218,7 @@
 {"name":"gitaly","version":"17.8.4","platform":"ruby","checksum":"196d9735a83f8a7d396baa216b979eb0c801622d8b7573f90010338d5b0c7b4f"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
 {"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"},
-{"name":"gitlab-cloud-connector","version":"1.11.0","platform":"ruby","checksum":"fb131bb3d04a7d014a08311cd7ff669ed3c5577d9d0b11df7216f768dfd5c0c8"},
+{"name":"gitlab-cloud-connector","version":"1.12.0","platform":"ruby","checksum":"b1eb7b0f5cb6633929681904d92771b387ec126b02319cd6cb62dd04bd5750af"},
 {"name":"gitlab-crystalball","version":"0.7.2","platform":"ruby","checksum":"c4ed7871d5952377ba38dedc2d64febc204273b5a7d98c954b777b4a9aceb49a"},
 {"name":"gitlab-dangerfiles","version":"4.9.1","platform":"ruby","checksum":"296b19d8aca5e4da8d391234914a1c4dfedc29700ddbcd9c554b6ffaa7fdf1b2"},
 {"name":"gitlab-experiment","version":"0.9.1","platform":"ruby","checksum":"f230ee742154805a755d5f2539dc44d93cdff08c5bbbb7656018d61f93d01f48"},
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 96a0854f3a8..e3ceaf40e89 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -748,7 +748,7 @@ GEM
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.11.0)
+    gitlab-cloud-connector (1.12.0)
       activesupport (~> 7.0)
       jwt (~> 2.9.3)
     gitlab-crystalball (0.7.2)
diff --git a/app/assets/javascripts/access_tokens/index.js b/app/assets/javascripts/access_tokens/index.js
index fffddce82d1..7e65e9230d7 100644
--- a/app/assets/javascripts/access_tokens/index.js
+++ b/app/assets/javascripts/access_tokens/index.js
@@ -1,9 +1,11 @@
 import Vue from 'vue';
+import { pinia } from '~/pinia/instance';
 
 import { convertObjectPropsToCamelCase, parseBoolean } from '~/lib/utils/common_utils';
 import { parseRailsFormFields } from '~/lib/utils/forms';
 import { __, sprintf } from '~/locale';
 import Translate from '~/vue_shared/translate';
+import AccessTokens from '~/vue_shared/access_tokens/components/access_tokens.vue';
 import AccessTokenTableApp from './components/access_token_table_app.vue';
 import InactiveAccessTokenTableApp from './components/inactive_access_token_table_app.vue';
 import ExpiresAtField from './components/expires_at_field.vue';
@@ -126,6 +128,44 @@ export const initNewAccessTokenApp = () => {
   });
 };
 
+export const initSharedAccessTokenApp = () => {
+  const el = document.querySelector('#js-shared-access-token-app');
+
+  if (!el) {
+    return null;
+  }
+
+  const {
+    accessTokenMaxDate,
+    accessTokenMinDate,
+    accessTokenCreate,
+    accessTokenRevoke,
+    accessTokenRotate,
+    accessTokenShow,
+  } = el.dataset;
+
+  return new Vue({
+    el,
+    name: 'AccessTokensRoot',
+    pinia,
+    provide: {
+      accessTokenMaxDate,
+      accessTokenMinDate,
+      accessTokenCreate,
+      accessTokenRevoke,
+      accessTokenRotate,
+      accessTokenShow,
+    },
+    render(createElement) {
+      return createElement(AccessTokens, {
+        props: {
+          id: gon.current_user_id,
+        },
+      });
+    },
+  });
+};
+
 export const initTokensApp = () => {
   const el = document.getElementById('js-tokens-app');
 
diff --git a/app/assets/javascripts/admin/users/components/admin_users_filter_app.vue b/app/assets/javascripts/admin/users/components/admin_users_filter_app.vue
index c4033674a6b..b569c6d23fb 100644
--- a/app/assets/javascripts/admin/users/components/admin_users_filter_app.vue
+++ b/app/assets/javascripts/admin/users/components/admin_users_filter_app.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlFilteredSearch } from '@gitlab/ui';
 import { setUrlParams, visitUrl } from '~/lib/utils/url_utility';
-import { TOKENS } from 'ee_else_ce/admin/users/constants';
+import { TOKENS } from '../constants';
 import { initializeValuesFromQuery } from '../utils';
 
 const TOKEN_TYPES = TOKENS.map(({ type }) => type);
diff --git a/app/assets/javascripts/admin/users/constants.js b/app/assets/javascripts/admin/users/constants.js
index 41ba4e83105..0a68e8350b4 100644
--- a/app/assets/javascripts/admin/users/constants.js
+++ b/app/assets/javascripts/admin/users/constants.js
@@ -23,13 +23,10 @@ export const I18N_USER_ACTIONS = {
   untrust: s__('AdminUsers|Untrust user'),
 };
 
-// NOTE: the 'access_level' token is overridden in EE version
-export const ACCESS_LEVEL_TOKEN_TYPE = 'access_level';
-
 export const TOKENS = [
   {
     title: s__('AdminUsers|Access level'),
-    type: ACCESS_LEVEL_TOKEN_TYPE,
+    type: 'access_level',
     token: GlFilteredSearchToken,
     operators: OPERATORS_IS,
     unique: true,
diff --git a/app/assets/javascripts/admin/users/utils.js b/app/assets/javascripts/admin/users/utils.js
index b4ddf0743a2..5c6c53078f3 100644
--- a/app/assets/javascripts/admin/users/utils.js
+++ b/app/assets/javascripts/admin/users/utils.js
@@ -6,7 +6,7 @@ import {
   TOKENS,
   SOLO_OWNED_ORGANIZATIONS_EMPTY,
   SOLO_OWNED_ORGANIZATIONS_REQUESTED_COUNT,
-} from 'ee_else_ce/admin/users/constants';
+} from './constants';
 
 export const generateUserPaths = (paths, id) => {
   return Object.fromEntries(
diff --git a/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue b/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue
index b8a0d89c5a8..2a5385dd239 100644
--- a/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue
+++ b/app/assets/javascripts/ci/common/private/jobs_filtered_search/app.vue
@@ -40,16 +40,14 @@ export default {
         },
       ];
 
-      if (this.glFeatures.populateAndUseBuildSourceTable) {
-        tokens.push({
-          type: TOKEN_TYPE_JOBS_SOURCE,
-          title: TOKEN_TITLE_JOBS_SOURCE,
-          icon: 'trigger-source',
-          unique: true,
-          token: JobSourceToken,
-          operators: OPERATORS_IS,
-        });
-      }
+      tokens.push({
+        type: TOKEN_TYPE_JOBS_SOURCE,
+        title: TOKEN_TITLE_JOBS_SOURCE,
+        icon: 'trigger-source',
+        unique: true,
+        token: JobSourceToken,
+        operators: OPERATORS_IS,
+      });
 
       if (this.glFeatures.adminJobsFilterRunnerType) {
         tokens.push({
@@ -76,10 +74,6 @@ export default {
                 },
               ];
             case 'sources':
-              if (!this.glFeatures.populateAndUseBuildSourceTable) {
-                return acc;
-              }
-
               return [
                 ...acc,
                 {
diff --git a/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue b/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue
index 2779f2e524b..f0f716775f3 100644
--- a/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue
+++ b/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue
@@ -132,9 +132,7 @@ export default {
   methods: {
     resetRequestData() {
       if (this.glFeatures.feSearchBuildByName) {
-        this.requestData = { statuses: null, name: null };
-      } else if (this.glFeatures.populateAndUseBuildSourceTable) {
-        this.requestData = { statuses: null, sources: null };
+        this.requestData = { statuses: null, sources: null, name: null };
       } else {
         this.requestData = { statuses: null, sources: null };
       }
@@ -185,8 +183,7 @@ export default {
           this.requestData.statuses = filter.value.data;
         }
 
-        // Technically, this shouldn't need to check the feature flag because the filter won't be available if the flag is disabled
-        if (this.glFeatures.populateAndUseBuildSourceTable && filter.type === 'jobs-source') {
+        if (filter.type === 'jobs-source') {
           this.requestData.sources = filter.value.data;
         }
       });
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index 2ec64311c56..57172c72580 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlLoadingIcon, GlModal } from '@gitlab/ui';
-import EmptyResult from '~/vue_shared/components/empty_result.vue';
 import { createAlert } from '~/alert';
 import { HTTP_STATUS_FORBIDDEN } from '~/lib/utils/http_status';
 import { mergeUrlParams, getParameterByName } from '~/lib/utils/url_utility';
@@ -15,7 +14,6 @@ export default {
     GroupsComponent,
     GlModal,
     GlLoadingIcon,
-    EmptyResult,
   },
   props: {
     action: {
@@ -235,7 +233,6 @@ export default {
     />
     <template v-else>
       <groups-component v-if="hasGroups" :groups="groups" :page-info="pageInfo" :action="action" />
-      <empty-result v-else-if="fromSearch" data-testid="search-empty-state" />
       <slot v-else name="empty-state"></slot>
     </template>
     <gl-modal
diff --git a/app/assets/javascripts/groups/components/empty_states/dashboard_groups_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/dashboard_groups_empty_state.vue
new file mode 100644
index 00000000000..7488b59822a
--- /dev/null
+++ b/app/assets/javascripts/groups/components/empty_states/dashboard_groups_empty_state.vue
@@ -0,0 +1,29 @@
+<script>
+import groupsEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/empty-state/empty-groups-md.svg?url';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
+
+export default {
+  components: { ResourceListsEmptyState },
+  groupsEmptyStateIllustration,
+  props: {
+    search: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+};
+</script>
+
+<template>
+  <resource-lists-empty-state
+    :title="s__('GroupsEmptyState|A group is a collection of several projects')"
+    :description="
+      s__(
+        'GroupsEmptyState|If you organize your projects under a group, it works like a folder. You can manage your group member\'s permissions and access to each project in the group.',
+      )
+    "
+    :svg-path="$options.groupsEmptyStateIllustration"
+    :search="search"
+  />
+</template>
diff --git a/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue
index 76e6bb5fe24..fc964b31ebc 100644
--- a/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue
+++ b/app/assets/javascripts/groups/components/empty_states/groups_explore_empty_state.vue
@@ -1,20 +1,24 @@
 <script>
-import { GlEmptyState } from '@gitlab/ui';
 import groupsEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/empty-state/empty-groups-md.svg?url';
-
-import { s__ } from '~/locale';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
 
 export default {
-  components: { GlEmptyState },
+  components: { ResourceListsEmptyState },
   groupsEmptyStateIllustration,
-  computed: {
-    title() {
-      return s__('GroupsEmptyState|No public or internal groups');
+  props: {
+    search: {
+      type: String,
+      required: false,
+      default: '',
     },
   },
 };
 </script>
 
 <template>
-  <gl-empty-state :title="title" :svg-path="$options.groupsEmptyStateIllustration" />
+  <resource-lists-empty-state
+    :title="s__('GroupsEmptyState|No public or internal groups')"
+    :svg-path="$options.groupsEmptyStateIllustration"
+    :search="search"
+  />
 </template>
diff --git a/app/assets/javascripts/groups/components/empty_states/inactive_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/inactive_projects_empty_state.vue
index eb04a0abac2..f5a7a47b670 100644
--- a/app/assets/javascripts/groups/components/empty_states/inactive_projects_empty_state.vue
+++ b/app/assets/javascripts/groups/components/empty_states/inactive_projects_empty_state.vue
@@ -1,22 +1,32 @@
 <script>
-import { GlEmptyState } from '@gitlab/ui';
-
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
 import { s__ } from '~/locale';
+import { SEARCH_MINIMUM_LENGTH } from '../../constants';
 
 export default {
-  components: { GlEmptyState },
+  components: { ResourceListsEmptyState },
+  SEARCH_MINIMUM_LENGTH,
   i18n: {
     title: s__('GroupsEmptyState|There are no inactive projects in this group'),
     description: s__('GroupsEmptyState|Projects that are no longer used are displayed here.'),
   },
   inject: ['emptyProjectsIllustration'],
+  props: {
+    search: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
 };
 </script>
 
 <template>
-  <gl-empty-state
+  <resource-lists-empty-state
     :title="$options.i18n.title"
     :description="$options.i18n.description"
     :svg-path="emptyProjectsIllustration"
+    :search="search"
+    :search-minimum-length="$options.SEARCH_MINIMUM_LENGTH"
   />
 </template>
diff --git a/app/assets/javascripts/groups/components/empty_states/shared_groups_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/shared_groups_empty_state.vue
index cce7dd9485e..0ff20c9efcc 100644
--- a/app/assets/javascripts/groups/components/empty_states/shared_groups_empty_state.vue
+++ b/app/assets/javascripts/groups/components/empty_states/shared_groups_empty_state.vue
@@ -1,12 +1,14 @@
 <script>
-import { GlEmptyState, GlSprintf } from '@gitlab/ui';
+import { GlSprintf } from '@gitlab/ui';
 import groupsEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/empty-state/empty-groups-md.svg?url';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
 import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
-
 import { s__ } from '~/locale';
+import { SEARCH_MINIMUM_LENGTH } from '../../constants';
 
 export default {
-  components: { GlEmptyState, GlSprintf, HelpPageLink },
+  components: { ResourceListsEmptyState, GlSprintf, HelpPageLink },
+  SEARCH_MINIMUM_LENGTH,
   groupsEmptyStateIllustration,
   i18n: {
     title: s__('GroupsEmptyState|This group has not been invited to any other groups.'),
@@ -14,11 +16,23 @@ export default {
       'GroupsEmptyState|Other groups this group has been %{linkStart}invited to%{linkEnd} will appear here.',
     ),
   },
+  props: {
+    search: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
 };
 </script>
 
 <template>
-  <gl-empty-state :title="$options.i18n.title" :svg-path="$options.groupsEmptyStateIllustration">
+  <resource-lists-empty-state
+    :title="$options.i18n.title"
+    :svg-path="$options.groupsEmptyStateIllustration"
+    :search="search"
+    :search-minimum-length="$options.SEARCH_MINIMUM_LENGTH"
+  >
     <template #description>
       <gl-sprintf :message="$options.i18n.description">
         <template #link="{ content }">
@@ -30,5 +44,5 @@ export default {
         </template>
       </gl-sprintf>
     </template>
-  </gl-empty-state>
+  </resource-lists-empty-state>
 </template>
diff --git a/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue
index a4af9bd09f8..b6efe078df8 100644
--- a/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue
+++ b/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue
@@ -1,11 +1,13 @@
 <script>
-import { GlEmptyState, GlSprintf } from '@gitlab/ui';
+import { GlSprintf } from '@gitlab/ui';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
 import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
-
 import { s__ } from '~/locale';
+import { SEARCH_MINIMUM_LENGTH } from '../../constants';
 
 export default {
-  components: { GlEmptyState, HelpPageLink, GlSprintf },
+  components: { ResourceListsEmptyState, HelpPageLink, GlSprintf },
+  SEARCH_MINIMUM_LENGTH,
   i18n: {
     title: s__('GroupsEmptyState|This group has not been invited to any other projects.'),
     description: s__(
@@ -13,11 +15,23 @@ export default {
     ),
   },
   inject: ['emptyProjectsIllustration'],
+  props: {
+    search: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
 };
 </script>
 
 <template>
-  <gl-empty-state :title="$options.i18n.title" :svg-path="emptyProjectsIllustration">
+  <resource-lists-empty-state
+    :title="$options.i18n.title"
+    :svg-path="emptyProjectsIllustration"
+    :search="search"
+    :search-minimum-length="$options.SEARCH_MINIMUM_LENGTH"
+  >
     <template #description>
       <gl-sprintf :message="$options.i18n.description">
         <template #link="{ content }">
@@ -29,5 +43,5 @@ export default {
         </template>
       </gl-sprintf>
     </template>
-  </gl-empty-state>
+  </resource-lists-empty-state>
 </template>
diff --git a/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue
index 8aba06fc2d7..e28f91123b4 100644
--- a/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue
+++ b/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue
@@ -1,11 +1,12 @@
 <script>
-import { GlEmptyState } from '@gitlab/ui';
 import ActionCard from '~/vue_shared/components/action_card.vue';
-
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
 import { s__ } from '~/locale';
+import { SEARCH_MINIMUM_LENGTH } from '../../constants';
 
 export default {
-  components: { GlEmptyState, ActionCard },
+  components: { ResourceListsEmptyState, ActionCard },
+  SEARCH_MINIMUM_LENGTH,
   i18n: {
     title: s__('GroupsEmptyState|There are no subgroups or projects in this group'),
     description: s__(
@@ -30,6 +31,13 @@ export default {
     'canCreateSubgroups',
     'canCreateProjects',
   ],
+  props: {
+    search: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
   computed: {
     hasActions() {
       return this.canCreateSubgroups || this.canCreateProjects;
@@ -42,10 +50,12 @@ export default {
 </script>
 
 <template>
-  <gl-empty-state
+  <resource-lists-empty-state
     :title="$options.i18n.title"
     :svg-path="emptySubgroupIllustration"
     :description="description"
+    :search="search"
+    :search-minimum-length="$options.SEARCH_MINIMUM_LENGTH"
   >
     <template v-if="hasActions" #actions>
       <div
@@ -72,5 +82,5 @@ export default {
         />
       </div>
     </template>
-  </gl-empty-state>
+  </resource-lists-empty-state>
 </template>
diff --git a/app/assets/javascripts/groups/components/groups_list_with_filtered_search_app.vue b/app/assets/javascripts/groups/components/groups_list_with_filtered_search_app.vue
index 2463bc26b45..2c611a99193 100644
--- a/app/assets/javascripts/groups/components/groups_list_with_filtered_search_app.vue
+++ b/app/assets/javascripts/groups/components/groups_list_with_filtered_search_app.vue
@@ -149,7 +149,7 @@ export default {
     />
     <groups-app :service="service" :store="store">
       <template #empty-state>
-        <slot name="empty-state"></slot>
+        <slot name="empty-state" :search="search"></slot>
       </template>
     </groups-app>
   </div>
diff --git a/app/assets/javascripts/groups/components/overview_tabs.vue b/app/assets/javascripts/groups/components/overview_tabs.vue
index dbfbdfb0da1..8f452b64b25 100644
--- a/app/assets/javascripts/groups/components/overview_tabs.vue
+++ b/app/assets/javascripts/groups/components/overview_tabs.vue
@@ -27,8 +27,6 @@ import SharedProjectsEmptyState from './empty_states/shared_projects_empty_state
 import SharedGroupsEmptyState from './empty_states/shared_groups_empty_state.vue';
 import InactiveProjectsEmptyState from './empty_states/inactive_projects_empty_state.vue';
 
-const MIN_SEARCH_LENGTH = 3;
-
 export default {
   components: {
     GlTabs,
@@ -227,9 +225,7 @@ export default {
     onFilter(filtersQuery) {
       this.search = filtersQuery[OVERVIEW_TABS_FILTERED_SEARCH_TERM_KEY];
 
-      if (!this.search || this.search.length >= MIN_SEARCH_LENGTH) {
-        this.handleSearchOrSortChange();
-      }
+      this.handleSearchOrSortChange();
     },
   },
   i18n: {
@@ -263,7 +259,7 @@ export default {
     >
       <groups-app :action="key" :service="service" :store="store">
         <template v-if="emptyStateComponent" #empty-state>
-          <component :is="emptyStateComponent" />
+          <component :is="emptyStateComponent" :search="search" />
         </template>
       </groups-app>
     </gl-tab>
diff --git a/app/assets/javascripts/groups/constants.js b/app/assets/javascripts/groups/constants.js
index d8293453c18..ecc9ebd3452 100644
--- a/app/assets/javascripts/groups/constants.js
+++ b/app/assets/javascripts/groups/constants.js
@@ -7,6 +7,7 @@ import {
 } from '~/groups_projects/constants';
 
 export const MAX_CHILDREN_COUNT = 20;
+export const SEARCH_MINIMUM_LENGTH = 3;
 
 export const ACTIVE_TAB_SUBGROUPS_AND_PROJECTS = 'subgroups_and_projects';
 export const ACTIVE_TAB_SHARED = 'shared';
diff --git a/app/assets/javascripts/groups/init_groups_list_with_filtered_search.js b/app/assets/javascripts/groups/init_groups_list_with_filtered_search.js
index 792707b5679..53e278f25f3 100644
--- a/app/assets/javascripts/groups/init_groups_list_with_filtered_search.js
+++ b/app/assets/javascripts/groups/init_groups_list_with_filtered_search.js
@@ -47,7 +47,7 @@ export const initGroupsListWithFilteredSearch = ({ filteredSearchNamespace, Empt
           initialSort,
         },
         scopedSlots: {
-          'empty-state': () => createElement(EmptyState),
+          'empty-state': ({ search }) => createElement(EmptyState, { props: { search } }),
         },
       });
     },
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/delete_button.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/delete_button.vue
index bb1dac40b92..b268b0f3316 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/delete_button.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/delete_button.vue
@@ -43,8 +43,7 @@ export default {
       :disabled="disabled"
       :title="title"
       :aria-label="title"
-      variant="danger"
-      category="secondary"
+      category="tertiary"
       icon="remove"
       @click="$emit('delete')"
     />
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue
index 377f7d25920..f4a53858500 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue
@@ -266,12 +266,11 @@ export default {
           variant="warning"
         />
       </div>
-    </template>
 
-    <template v-if="signatures.length" #left-after-toggle>
       <gl-badge
+        v-if="signatures.length"
         v-gl-tooltip.d0="$options.i18n.SIGNATURE_BADGE_TOOLTIP"
-        class="gl-ml-4"
+        class="sm:gl-ml-3"
         data-testid="signed-badge"
       >
         {{ s__('ContainerRegistry|Signed') }}
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
index 1251480728b..6d2755973ea 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
@@ -198,7 +198,6 @@ export default {
         </gl-skeleton-loader>
       </div>
     </template>
-    <template #right-primary> &nbsp; </template>
     <template #right-secondary>
       <publish-message
         :project-name="projectName"
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/constants/quick_start.js b/app/assets/javascripts/packages_and_registries/container_registry/explorer/constants/quick_start.js
index 6a39c07eba2..9189c7b889d 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/constants/quick_start.js
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/constants/quick_start.js
@@ -1,6 +1,6 @@
 import { s__ } from '~/locale';
 
-export const QUICK_START = s__('ContainerRegistry|CLI Commands');
+export const QUICK_START = s__('ContainerRegistry|CLI commands');
 export const LOGIN_COMMAND_LABEL = s__('ContainerRegistry|Login');
 export const COPY_LOGIN_TITLE = s__('ContainerRegistry|Copy login command');
 export const BUILD_COMMAND_LABEL = s__('ContainerRegistry|Build an image');
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue
index e65a04ff7fd..79df179e97c 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue
@@ -302,11 +302,13 @@ export default {
             :docker-build-command="dockerBuildCommand"
             :docker-push-command="dockerPushCommand"
             :docker-login-command="dockerLoginCommand"
+            class="!gl-w-auto"
           />
           <gl-button
             v-if="config.showContainerRegistrySettings"
             v-gl-tooltip="$options.i18n.SETTINGS_TEXT"
             icon="settings"
+            class="!gl-w-auto"
             :href="config.settingsPath"
             :aria-label="$options.i18n.SETTINGS_TEXT"
           />
diff --git a/app/assets/javascripts/packages_and_registries/shared/constants/quick_start.js b/app/assets/javascripts/packages_and_registries/shared/constants/quick_start.js
index 6a39c07eba2..9189c7b889d 100644
--- a/app/assets/javascripts/packages_and_registries/shared/constants/quick_start.js
+++ b/app/assets/javascripts/packages_and_registries/shared/constants/quick_start.js
@@ -1,6 +1,6 @@
 import { s__ } from '~/locale';
 
-export const QUICK_START = s__('ContainerRegistry|CLI Commands');
+export const QUICK_START = s__('ContainerRegistry|CLI commands');
 export const LOGIN_COMMAND_LABEL = s__('ContainerRegistry|Login');
 export const COPY_LOGIN_TITLE = s__('ContainerRegistry|Copy login command');
 export const BUILD_COMMAND_LABEL = s__('ContainerRegistry|Build an image');
diff --git a/app/assets/javascripts/pages/dashboard/groups/index/index.js b/app/assets/javascripts/pages/dashboard/groups/index/index.js
index fd69b355075..699cb71f867 100644
--- a/app/assets/javascripts/pages/dashboard/groups/index/index.js
+++ b/app/assets/javascripts/pages/dashboard/groups/index/index.js
@@ -1,8 +1,10 @@
 import { initGroupsListWithFilteredSearch } from '~/groups/init_groups_list_with_filtered_search';
 import { initYourWorkGroups } from '~/groups/your_work';
 import { DASHBOARD_FILTERED_SEARCH_NAMESPACE } from '~/groups/constants';
+import DashboardGroupsEmptyState from '~/groups/components/empty_states/dashboard_groups_empty_state.vue';
 
 initGroupsListWithFilteredSearch({
   filteredSearchNamespace: DASHBOARD_FILTERED_SEARCH_NAMESPACE,
+  EmptyState: DashboardGroupsEmptyState,
 });
 initYourWorkGroups();
diff --git a/app/assets/javascripts/pages/user_settings/personal_access_tokens/index.js b/app/assets/javascripts/pages/user_settings/personal_access_tokens/index.js
index c520042c172..9676fba883e 100644
--- a/app/assets/javascripts/pages/user_settings/personal_access_tokens/index.js
+++ b/app/assets/javascripts/pages/user_settings/personal_access_tokens/index.js
@@ -2,10 +2,12 @@ import {
   initAccessTokenTableApp,
   initExpiresAtField,
   initNewAccessTokenApp,
+  initSharedAccessTokenApp,
   initTokensApp,
 } from '~/access_tokens';
 
 initAccessTokenTableApp();
 initExpiresAtField();
-initNewAccessTokenApp();
 initTokensApp();
+initSharedAccessTokenApp();
+initNewAccessTokenApp();
diff --git a/app/assets/javascripts/vue_shared/components/registry/list_item.vue b/app/assets/javascripts/vue_shared/components/registry/list_item.vue
index d757bf2fa78..3f56e776af7 100644
--- a/app/assets/javascripts/vue_shared/components/registry/list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/list_item.vue
@@ -60,10 +60,10 @@ export default {
     class="gl-flex gl-flex-col gl-border-b-1 gl-border-t-1 gl-border-b-solid gl-border-t-solid"
     :class="optionalClasses"
   >
-    <div class="gl-flex gl-items-center gl-py-3">
+    <div class="gl-flex gl-py-3">
       <div
         v-if="$slots['left-action'] /* eslint-disable-line @gitlab/vue-prefer-dollar-scopedslots */"
-        class="gl-flex gl-w-7 gl-justify-start gl-pl-2"
+        class="gl-flex gl-w-7 gl-justify-start gl-pt-2"
       >
         <slot name="left-action"></slot>
       </div>
@@ -73,7 +73,7 @@ export default {
             v-if="
               $slots['left-primary'] /* eslint-disable-line @gitlab/vue-prefer-dollar-scopedslots */
             "
-            class="gl-flex gl-min-h-6 gl-min-w-0 gl-items-center gl-font-semibold gl-text-default"
+            class="gl-min-h-6 gl-min-w-0 gl-items-center gl-font-semibold gl-text-default sm:gl-flex"
           >
             <slot name="left-primary"></slot>
             <gl-button
@@ -88,7 +88,6 @@ export default {
               :aria-expanded="isDetailsShown"
               @click="toggleDetails"
             />
-            <slot name="left-after-toggle"></slot>
           </div>
           <div
             v-if="
@@ -130,7 +129,7 @@ export default {
         v-if="
           $slots['right-action'] /* eslint-disable-line @gitlab/vue-prefer-dollar-scopedslots */
         "
-        class="gl-flex gl-w-9 gl-justify-end gl-pr-1"
+        class="gl-items-center gl-pl-3 sm:gl-flex"
       >
         <slot name="right-action"></slot>
       </div>
diff --git a/app/assets/javascripts/vue_shared/components/registry/title_area.vue b/app/assets/javascripts/vue_shared/components/registry/title_area.vue
index a148cd0025a..fa36805af7b 100644
--- a/app/assets/javascripts/vue_shared/components/registry/title_area.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/title_area.vue
@@ -84,7 +84,7 @@ export default {
             <div
               v-for="(row, metadataIndex) in metadataSlots"
               :key="metadataIndex"
-              class="gl-mr-3 gl-flex gl-items-center"
+              class="gl-mr-5 gl-flex gl-flex-wrap gl-items-center"
             >
               <slot :name="row"></slot>
             </div>
diff --git a/app/assets/javascripts/work_items/components/create_work_item.vue b/app/assets/javascripts/work_items/components/create_work_item.vue
index 8817ef094b4..3bdd6de479b 100644
--- a/app/assets/javascripts/work_items/components/create_work_item.vue
+++ b/app/assets/javascripts/work_items/components/create_work_item.vue
@@ -13,7 +13,7 @@ import {
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { createAlert } from '~/alert';
 import { clearDraft } from '~/lib/utils/autosave';
-import { isMetaEnterKeyPair } from '~/lib/utils/common_utils';
+import { isMetaEnterKeyPair, parseBoolean } from '~/lib/utils/common_utils';
 import { getParameterByName } from '~/lib/utils/url_utility';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { s__, sprintf } from '~/locale';
@@ -193,10 +193,11 @@ export default {
   data() {
     return {
       isTitleValid: true,
-      isConfidential: false,
+      isConfidential: parseBoolean(getParameterByName('issue[confidential]')),
       isRelatedToItem: true,
       localTitle: this.title || '',
       error: null,
+      workItem: {},
       workItemTypes: [],
       selectedProjectFullPath: this.initialSelectedProject(),
       selectedWorkItemTypeId: null,
@@ -212,7 +213,6 @@ export default {
     };
   },
   apollo: {
-    // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
     workItem: {
       query: workItemByIidQuery,
       variables() {
@@ -252,20 +252,14 @@ export default {
           return;
         }
 
-        let workItemDescription = '';
-        let workItemTitle = '';
-
         // The follow up title and description can come from the backend for the following three use cases
         // 1. when resolving a discussion in the MR and we have the merge request id in the query param
         // 2. when the issue and title are added in the query param . read https://docs.gitlab.com/user/project/issues/create_issues/#using-a-url-with-prefilled-values
         // 3. when following up a work item with a vulnerability, where we have the vulnerability id in the query param
-
-        workItemTitle = document.querySelector(
-          '.follow_up_work_item .follow-up-title',
-        )?.textContent;
-        workItemDescription = document.querySelector(
-          '.follow_up_work_item .follow-up-description',
-        )?.textContent;
+        const workItemTitle = document.querySelector('.params-title')?.textContent.trim();
+        const workItemDescription = document
+          .querySelector('.params-description')
+          ?.textContent.trim();
 
         for await (const workItemType of this.workItemTypes) {
           await setNewWorkItemCache(
@@ -488,10 +482,10 @@ export default {
       );
     },
     resolvingMRDiscussionLink() {
-      return document.querySelector('.follow_up_work_item_details span.note-link a')?.href || '';
+      return document.querySelector('.params-discussion-to-resolve a')?.href || '';
     },
     resolvingMRDiscussionLinkText() {
-      return document.querySelector('.follow_up_work_item_details span.note-link a')?.text || '';
+      return document.querySelector('.params-discussion-to-resolve a')?.text || '';
     },
     createWorkItemWarning() {
       const warning =
@@ -924,7 +918,11 @@ export default {
               @error="updateError = $event"
               @updateDraft="updateDraftData('description', $event)"
             />
-            <div v-if="numberOfDiscussionsResolved && resolvingMRDiscussionLink" class="gl-mb-4">
+            <div
+              v-if="numberOfDiscussionsResolved && resolvingMRDiscussionLink"
+              class="gl-mb-4"
+              data-testid="work-item-resolve-discussion"
+            >
               <gl-icon class="gl-mr-2" name="information-o" />
               {{ createWorkItemWarning }}
               <gl-link :href="resolvingMRDiscussionLink">{{
diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue
index 44fc9d76f5a..7ecc6a69e95 100644
--- a/app/assets/javascripts/work_items/pages/create_work_item.vue
+++ b/app/assets/javascripts/work_items/pages/create_work_item.vue
@@ -1,5 +1,7 @@
 <script>
 import { visitUrl, getParameterByName, updateHistory, removeParams } from '~/lib/utils/url_utility';
+import { TYPENAME_WORK_ITEM } from '~/graphql_shared/constants';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
 import CreateWorkItem from '../components/create_work_item.vue';
 import CreateWorkItemCancelConfirmationModal from '../components/create_work_item_cancel_confirmation_modal.vue';
 import {
@@ -27,9 +29,15 @@ export default {
     },
   },
   data() {
+    // Generated by backend with add_related_issue query parameter
+    const relatedId = document.querySelector('.params-add-related-issue')?.textContent.trim();
+    const legacyAddRelatedIssueId = relatedId
+      ? convertToGraphQLId(TYPENAME_WORK_ITEM, relatedId)
+      : undefined;
+
     return {
       relatedItem: null,
-      relatedItemId: getParameterByName(RELATED_ITEM_ID_URL_QUERY_PARAM),
+      relatedItemId: getParameterByName(RELATED_ITEM_ID_URL_QUERY_PARAM) || legacyAddRelatedIssueId,
       isCancelConfirmationModalVisible: false,
       shouldDiscardDraft: false,
       workItemType: convertTypeEnumToName(this.workItemTypeEnum),
diff --git a/app/assets/javascripts/work_items/router/routes.js b/app/assets/javascripts/work_items/router/routes.js
index 7769cacd4c9..72e1a265102 100644
--- a/app/assets/javascripts/work_items/router/routes.js
+++ b/app/assets/javascripts/work_items/router/routes.js
@@ -3,6 +3,7 @@ import CreateWorkItem from '../pages/create_work_item.vue';
 import WorkItemDetail from '../pages/work_item_root.vue';
 import DesignDetail from '../components/design_management/design_preview/design_details.vue';
 import { ROUTES, WORK_ITEM_BASE_ROUTE_MAP } from '../constants';
+import { getEnumFromIssueTypeParameter } from '../utils';
 
 function generateTypeRegex(routeMap) {
   const types = Object.keys(routeMap);
@@ -21,7 +22,10 @@ function getRoutes() {
       name: ROUTES.new,
       component: CreateWorkItem,
       props: ({ params, query }) => ({
-        workItemTypeEnum: query.type || WORK_ITEM_BASE_ROUTE_MAP[params.type],
+        workItemTypeEnum:
+          query.type ||
+          getEnumFromIssueTypeParameter(query['issue[issue_type]']) ||
+          WORK_ITEM_BASE_ROUTE_MAP[params.type],
       }),
     },
     {
diff --git a/app/assets/javascripts/work_items/utils.js b/app/assets/javascripts/work_items/utils.js
index 43c670fa82b..991edb6c87c 100644
--- a/app/assets/javascripts/work_items/utils.js
+++ b/app/assets/javascripts/work_items/utils.js
@@ -35,6 +35,8 @@ import {
   WIDGET_TYPE_TIME_TRACKING,
   WIDGET_TYPE_VULNERABILITIES,
   WIDGET_TYPE_WEIGHT,
+  WORK_ITEM_TYPE_ENUM_INCIDENT,
+  WORK_ITEM_TYPE_ENUM_ISSUE,
   WORK_ITEM_TYPE_ROUTE_WORK_ITEM,
 } from './constants';
 
@@ -128,6 +130,13 @@ export const formatLabelForListbox = (label) => ({
 export const convertTypeEnumToName = (workItemTypeEnum) =>
   Object.keys(NAME_TO_ENUM_MAP).find((name) => NAME_TO_ENUM_MAP[name] === workItemTypeEnum);
 
+export const getEnumFromIssueTypeParameter = (param) => {
+  if (!param) {
+    return undefined;
+  }
+  return param === 'incident' ? WORK_ITEM_TYPE_ENUM_INCIDENT : WORK_ITEM_TYPE_ENUM_ISSUE;
+};
+
 /**
  * TODO: Remove this method with https://gitlab.com/gitlab-org/gitlab/-/issues/479637
  * We're currently setting children count per page based on `DEFAULT_PAGE_SIZE_CHILD_ITEMS`
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index d10fad48918..f73a609a7c2 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -254,7 +254,7 @@ class GraphqlController < ApplicationController
   end
 
   def query
-    GraphQL::Language.escape_single_quoted_newlines(permitted_params.fetch(:query, ''))
+    GraphQL::Language.escape_single_quoted_newlines(permitted_params.fetch(:query, '').to_s)
   end
 
   def multiplex_param
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 65a8869cc0d..d4dc75a523d 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -145,7 +145,7 @@ class SearchController < ApplicationController
       return true
     end
 
-    return true unless ::Gitlab::CurrentSettings.anonymous_searches_allowed?
+    return true if ::Feature.disabled?(:allow_anonymous_searches, type: :ops)
 
     false
   end
diff --git a/app/controllers/user_settings/personal_access_tokens_controller.rb b/app/controllers/user_settings/personal_access_tokens_controller.rb
index a9ae9ecd8de..bd81b342523 100644
--- a/app/controllers/user_settings/personal_access_tokens_controller.rb
+++ b/app/controllers/user_settings/personal_access_tokens_controller.rb
@@ -62,7 +62,9 @@ module UserSettings
 
       if result.success?
         tokens, size = active_access_tokens
-        render json: { new_token: @personal_access_token.token,
+        render json: { token: @personal_access_token.token,
+                       # Delete when `migrate_user_access_tokens_ui` feature flag is removed
+                       new_token: @personal_access_token.token,
                        active_access_tokens: tokens, total: size }, status: :ok
       else
         render json: { errors: result.errors }, status: :unprocessable_entity
diff --git a/app/events/merge_requests/auto_merge/title_description_update_event.rb b/app/events/merge_requests/auto_merge/title_description_update_event.rb
new file mode 100644
index 00000000000..d8b54cbe015
--- /dev/null
+++ b/app/events/merge_requests/auto_merge/title_description_update_event.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module MergeRequests
+  module AutoMerge
+    class TitleDescriptionUpdateEvent < Gitlab::EventStore::Event
+      def schema
+        {
+          'type' => 'object',
+          'required' => %w[
+            current_user_id
+            merge_request_id
+          ],
+          'properties' => {
+            'current_user_id' => { 'type' => 'integer' },
+            'merge_request_id' => { 'type' => 'integer' }
+          }
+        }
+      end
+    end
+  end
+end
diff --git a/app/helpers/access_tokens_helper.rb b/app/helpers/access_tokens_helper.rb
index ffac07244fe..5387508c715 100644
--- a/app/helpers/access_tokens_helper.rb
+++ b/app/helpers/access_tokens_helper.rb
@@ -35,6 +35,17 @@ module AccessTokensHelper
     }.to_json
   end
 
+  def personal_access_token_data
+    {
+      access_token: {
+        create: user_settings_personal_access_tokens_path,
+        revoke: api_v4_personal_access_tokens_path,
+        rotate: api_v4_personal_access_tokens_path,
+        show: api_v4_personal_access_tokens_path
+      }
+    }
+  end
+
   def expires_at_field_data
     {
       min_date: 1.day.from_now.iso8601,
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 9286999b64f..0a2d2d8acb8 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -74,13 +74,6 @@ module ApplicationSettingsHelper
 
   def global_search_settings_checkboxes(form)
     [
-      form.gitlab_ui_checkbox_component(
-        :anonymous_searches_allowed,
-        _("Allow unauthenticated users to use search"),
-        checkbox_options: {
-          checked: @application_setting.anonymous_searches_allowed, multiple: false
-        }
-      ),
       form.gitlab_ui_checkbox_component(
         :global_search_block_anonymous_searches_enabled,
         _("Restrict global search to authenticated users only"),
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index ae662d204af..2edd84f48c8 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -716,7 +716,7 @@ class ApplicationSetting < ApplicationRecord
 
   jsonb_accessor :service_ping_settings,
     gitlab_environment_toolkit_instance: [:boolean, { default: false }],
-    gitlab_product_usage_data_enabled: [:boolean, { default: true }]
+    gitlab_product_usage_data_enabled: [:boolean, { default: Settings.gitlab['initial_gitlab_product_usage_data'] }]
 
   jsonb_accessor :rate_limits_unauthenticated_git_http,
     throttle_unauthenticated_git_http_enabled: [:boolean, { default: false }],
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index fe1330f9727..d4ccac15b3b 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -107,7 +107,6 @@ module ApplicationSettingImplementation
         gitaly_timeout_default: 55,
         gitaly_timeout_fast: 10,
         gitaly_timeout_medium: 30,
-        gitlab_product_usage_data_enabled: Settings.gitlab['initial_gitlab_product_usage_data'],
         gitpod_enabled: false,
         gitpod_url: 'https://gitpod.io/',
         gravatar_enabled: Settings.gravatar['enabled'],
diff --git a/app/services/auth/dependency_proxy_authentication_service.rb b/app/services/auth/dependency_proxy_authentication_service.rb
index c6b156e58a9..be992f5abd1 100644
--- a/app/services/auth/dependency_proxy_authentication_service.rb
+++ b/app/services/auth/dependency_proxy_authentication_service.rb
@@ -16,9 +16,6 @@ module Auth
       return error('dependency proxy not enabled', 404) unless ::Gitlab.config.dependency_proxy.enabled
       return error('access forbidden', 403) unless valid_user_actor?
 
-      # TODO: Remove this when enforce_abilities_check_for_dependency_proxy is permanently enabled
-      log_missing_authentication_abilities unless deploy_token || has_required_abilities?
-
       { token: authorized_token.encoded }
     end
 
@@ -50,10 +47,8 @@ module Auth
       # https://gitlab.com/gitlab-org/gitlab/-/issues/520321
       if Feature.enabled?(:packages_dependency_proxy_containers_scope_check, feature_user)
         dependency_proxy_containers_scope_check
-      elsif Feature.enabled?(:enforce_abilities_check_for_dependency_proxy, feature_user)
-        has_required_abilities?
       else
-        current_user || valid_deploy_token?
+        has_required_abilities?
       end
     end
 
@@ -77,10 +72,6 @@ module Auth
       PersonalAccessTokensFinder.new(state: 'active').find_by_token(raw_token.to_s)
     end
 
-    def valid_deploy_token?
-      deploy_token && deploy_token.valid_for_dependency_proxy?
-    end
-
     def authorized_token
       JSONWebToken::HMACToken.new(self.class.secret).tap do |token|
         token['user_id'] = current_user.id if current_user
@@ -108,16 +99,5 @@ module Auth
     def personal_access_token_user?
       raw_token && current_user && (current_user.human? || current_user.service_account?)
     end
-
-    def log_missing_authentication_abilities
-      log_info = {
-        message: MISSING_ABILITIES_MESSAGE,
-        authentication_abilities: authentication_abilities,
-        username: current_user&.username,
-        user_id: current_user&.id
-      }.compact
-
-      Gitlab::AuthLogger.warn(log_info)
-    end
   end
 end
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index 9e671d3a4a6..bae0ebcc3bc 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -34,10 +34,26 @@
       = f.gitlab_ui_checkbox_component :remember_me_enabled, _('Allow users to extend their session'), help_text: _("Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more%{link_end}.").html_safe % { link_start: remember_me_help_link_start, link_end: '</a>'.html_safe }
 
     = render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f
-    = render 'admin/application_settings/require_personal_access_token_expiry', form: f
-    = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
-    = render_if_exists 'admin/application_settings/service_access_tokens_expiration_enforced', form: f
     = render_if_exists 'admin/application_settings/allow_top_level_group_owners_to_create_service_accounts', form: f
+
+    .form-group
+      = f.label :disable_feed_token, s_('AdminSettings|Feed token')
+      = f.gitlab_ui_checkbox_component :disable_feed_token, s_('AdminSettings|Disable feed token')
+
+    = render_if_exists 'admin/application_settings/disable_personal_access_tokens', form: f
+    %h5= s_('AccessTokens|Access token expiration')
+    .form-group
+      = render 'admin/application_settings/require_access_token_expiry', form: f
+      = render_if_exists 'admin/application_settings/service_accounts_pats_expiration_enforced', form: f
+    .form-group
+      = f.label :personal_access_token_prefix, s_('AccessTokens|Access token prefix')
+      = f.text_field :personal_access_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input'
+    - if Feature.enabled?(:custom_prefix_for_all_token_types, :instance)
+      .form-group
+        = f.label :instance_token_prefix, s_('AccessTokens|Instance token prefix')
+        = f.text_field :instance_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input'
+    = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
+
     = render_if_exists 'admin/application_settings/ssh_key_expiration_policy', form: f
 
     .form-group
@@ -70,15 +86,6 @@
           .form-text.gl-text-subtle
             = _('Must be 90 days or more. Applies only to users with sign-in history. Users with no sign-in history are automatically deactivated after 7 days.')
 
-    .form-group
-      = f.label :personal_access_token_prefix, _('Personal access token prefix'), class: 'label-light'
-      = f.text_field :personal_access_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input'
-
-    - if Feature.enabled?(:custom_prefix_for_all_token_types, :instance)
-      .form-group
-        = f.label :instance_token_prefix, _('Instance token prefix'), class: 'label-light'
-        = f.text_field :instance_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input'
-
     .form-group
       = f.label :user_show_add_ssh_key_message, _('Prompt users to upload SSH keys'), class: 'label-bold'
       = f.gitlab_ui_checkbox_component :user_show_add_ssh_key_message, _("Inform users without uploaded SSH keys that they can't push over SSH until one is added")
diff --git a/app/views/admin/application_settings/_require_access_token_expiry.html.haml b/app/views/admin/application_settings/_require_access_token_expiry.html.haml
new file mode 100644
index 00000000000..d2284362522
--- /dev/null
+++ b/app/views/admin/application_settings/_require_access_token_expiry.html.haml
@@ -0,0 +1,4 @@
+- pat_expiry_rules_link = link_to('', help_page_path('user/profile/personal_access_tokens.md', anchor: 'access-token-expiration', target: '_blank', rel: 'noopener noreferrer'))
+- help_text = safe_format(s_('AccessTokens|Forces new personal, group, project and impersonation tokens to require an expiration date. Does not affect existing token expiration dates or personal access tokens for service accounts. This setting overrides the group-level %{link_start}service account token expiration%{link_end} setting.'), tag_pair(pat_expiry_rules_link, :link_start, :link_end))
+
+= form.gitlab_ui_checkbox_component :require_personal_access_token_expiry, _('Require expiration date'), help_text: help_text
diff --git a/app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml b/app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml
deleted file mode 100644
index e6d51b6d120..00000000000
--- a/app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-- help_link = help_page_path('user/profile/personal_access_tokens.md', anchor: 'create-a-service-account-personal-access-token-with-no-expiry-date')
-- help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_link }
-- help_text = s_('AccessTokens|When enabled, a user will be required to enter in an expiration date when creating an access token. Changes will not affect existing token expiration dates. This setting overrides the group-level %{link_start}service account token expiration%{link_end} setting.').html_safe % { link_start: help_link_start, link_end: '</a>'.html_safe }
-
-.form-group
-  = form.label :require_personal_access_token_expiry, s_('AccessTokens|Personal / project / group access token expiration'), class: 'label-light'
-  = form.gitlab_ui_checkbox_component :require_personal_access_token_expiry, _('Require expiration date'), help_text: help_text
diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml
index ee074325930..9092267563a 100644
--- a/app/views/admin/application_settings/_visibility_and_access.html.haml
+++ b/app/views/admin/application_settings/_visibility_and_access.html.haml
@@ -48,12 +48,6 @@
         = f.label field_name, "#{type.upcase} SSH keys", class: 'label-bold'
         = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
 
-    = render_if_exists 'admin/application_settings/disable_personal_access_tokens', form: f
-
-    .form-group
-      %label.label-bold= s_('AdminSettings|Feed token')
-      = f.gitlab_ui_checkbox_component :disable_feed_token, s_('AdminSettings|Disable feed token')
-
     = render_if_exists 'admin/application_settings/disable_invite_members_setting', form: f
 
     = render_if_exists 'admin/application_settings/globally_allowed_ips', form: f
diff --git a/app/views/projects/issues/new.html.haml b/app/views/projects/issues/new.html.haml
index 02d93f3c5df..d1170c0e237 100644
--- a/app/views/projects/issues/new.html.haml
+++ b/app/views/projects/issues/new.html.haml
@@ -11,18 +11,15 @@
   - add_to_breadcrumbs _("Issues"), project_issues_path(@project)
   - breadcrumb_title _("New issue")
 
-- if @merge_request_to_resolve_discussions_of
-  .follow_up_work_item_details.hidden
-    %span.permission
-      = @merge_request_to_resolve_discussions_of.discussions_can_be_resolved_by?(current_user)
-    %span.note-link
-      = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve)
-
-.follow_up_work_item.hidden
-  %span.follow-up-title
+.new-issue-params.hidden
+  .params-title
     = @issue.title
-  .follow-up-description
+  .params-description
     = @issue.description
+  .params-add-related-issue
+    = @add_related_issue&.id
+  .params-discussion-to-resolve
+    = @merge_request_to_resolve_discussions_of ? link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve) : nil
 
 - if use_work_item
   #js-work-items{ data: work_items_data(@project, current_user) }
diff --git a/app/views/user_settings/personal_access_tokens/index.html.haml b/app/views/user_settings/personal_access_tokens/index.html.haml
index d67eaa78c26..46d52459686 100644
--- a/app/views/user_settings/personal_access_tokens/index.html.haml
+++ b/app/views/user_settings/personal_access_tokens/index.html.haml
@@ -4,33 +4,37 @@
 - type_plural = _('personal access tokens')
 - @force_desktop_expanded_sidebar = true
 
-= render ::Layouts::SettingsSectionComponent.new(page_title) do |c|
-  - c.with_description do
-    = s_('AccessTokens|You can generate a personal access token for each application you use that needs access to the GitLab API.')
-    = s_('AccessTokens|You can also use personal access tokens to authenticate against Git over HTTP.')
-    = s_('AccessTokens|They are the only accepted password when you have Two-Factor Authentication (2FA) enabled.')
-  - c.with_body do
-    #js-new-access-token-app{ data: { access_token_type: type } }
+- if Feature.enabled?(:migrate_user_access_tokens_ui, current_user)
+  #js-shared-access-token-app{ data: personal_access_token_data }
+- else
+  = render ::Layouts::SettingsSectionComponent.new(page_title) do |c|
+    - c.with_description do
+      = s_('AccessTokens|You can generate a personal access token for each application you use that needs access to the GitLab API.')
+      = s_('AccessTokens|You can also use personal access tokens to authenticate against Git over HTTP.')
+      = s_('AccessTokens|They are the only accepted password when you have Two-Factor Authentication (2FA) enabled.')
 
-    = render ::Layouts::CrudComponent.new(_('Active personal access tokens'),
-      icon: 'token',
-      count: @active_access_tokens_size,
-      count_options: { class: 'js-token-count', data: { testid: 'active-token-count' } },
-      toggle_text: _('Add new token'),
-      toggle_options: { data: { testid: 'add-new-token-button' } },
-      form_options: { class: 'js-add-new-token-form' },
-      options: { class: 'js-token-card' }) do |c|
-      - c.with_form do
-        = render 'shared/access_tokens/form',
-          ajax: true,
-          type: type,
-          path: user_settings_personal_access_tokens_path,
-          token: @personal_access_token,
-          scopes: @scopes,
-          help_path: help_page_path('user/profile/personal_access_tokens.md', anchor: 'personal-access-token-scopes')
+    - c.with_body do
+      #js-new-access-token-app{ data: { access_token_type: type } }
 
-      - c.with_body do
-        #js-access-token-table-app{ data: { access_token_type: type, access_token_type_plural: type_plural, backend_pagination: 'true', initial_active_access_tokens: @active_access_tokens.to_json } }
+      = render ::Layouts::CrudComponent.new(_('Active personal access tokens'),
+        icon: 'token',
+        count: @active_access_tokens_size,
+        count_options: { class: 'js-token-count', data: { testid: 'active-token-count' } },
+        toggle_text: _('Add new token'),
+        toggle_options: { data: { testid: 'add-new-token-button' } },
+        form_options: { class: 'js-add-new-token-form' },
+        options: { class: 'js-token-card' }) do |c|
+        - c.with_form do
+          = render 'shared/access_tokens/form',
+            ajax: true,
+            type: type,
+            path: user_settings_personal_access_tokens_path,
+            token: @personal_access_token,
+            scopes: @scopes,
+            help_path: help_page_path('user/profile/personal_access_tokens.md', anchor: 'personal-access-token-scopes')
+
+        - c.with_body do
+          #js-access-token-table-app{ data: { access_token_type: type, access_token_type_plural: type_plural, backend_pagination: 'true', initial_active_access_tokens: @active_access_tokens.to_json } }
 
 = render 'user_settings/personal_access_tokens/dpop' if Feature.enabled?(:dpop_authentication, current_user)
 
diff --git a/config/feature_flags/wip/enforce_abilities_check_for_dependency_proxy.yml b/config/feature_flags/beta/migrate_user_access_tokens_ui.yml
similarity index 54%
rename from config/feature_flags/wip/enforce_abilities_check_for_dependency_proxy.yml
rename to config/feature_flags/beta/migrate_user_access_tokens_ui.yml
index ce3b0254b09..32d13fc0ca7 100644
--- a/config/feature_flags/wip/enforce_abilities_check_for_dependency_proxy.yml
+++ b/config/feature_flags/beta/migrate_user_access_tokens_ui.yml
@@ -1,9 +1,10 @@
 ---
-name: enforce_abilities_check_for_dependency_proxy
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/520313
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182559
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/521193
-milestone: '17.10'
-group: group::container registry
-type: wip
+name: migrate_user_access_tokens_ui
+description: Improves the personal access token page UI
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425053
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/189817
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/538388
+milestone: '18.0'
+group: group::authentication
+type: beta
 default_enabled: false
diff --git a/config/feature_flags/ops/allow_anonymous_searches.yml b/config/feature_flags/ops/allow_anonymous_searches.yml
new file mode 100644
index 00000000000..248beb7c39d
--- /dev/null
+++ b/config/feature_flags/ops/allow_anonymous_searches.yml
@@ -0,0 +1,8 @@
+---
+name: allow_anonymous_searches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138975
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434218
+milestone: '16.7'
+type: ops
+group: group::global search
+default_enabled: true
diff --git a/db/post_migrate/20250506055121_finalize_delete_orphaned_groups.rb b/db/post_migrate/20250506055121_finalize_delete_orphaned_groups.rb
new file mode 100644
index 00000000000..8844ade25c0
--- /dev/null
+++ b/db/post_migrate/20250506055121_finalize_delete_orphaned_groups.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class FinalizeDeleteOrphanedGroups < Gitlab::Database::Migration[2.3]
+  milestone '18.0'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = "DeleteOrphanedGroups"
+
+  def up
+    return unless Gitlab.com_except_jh? && !Gitlab.staging?
+
+    ensure_batched_background_migration_is_finished(
+      job_class_name: MIGRATION,
+      table_name: :namespaces,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250506055121 b/db/schema_migrations/20250506055121
new file mode 100644
index 00000000000..b5bddcb84a2
--- /dev/null
+++ b/db/schema_migrations/20250506055121
@@ -0,0 +1 @@
+cab1b967986ef99193d53cbe1892cabd26a36b4abc7a62cf31bf8249742d8fdd
\ No newline at end of file
diff --git a/doc/administration/gitaly/_index.md b/doc/administration/gitaly/_index.md
index 695526fbd15..4a723f52046 100644
--- a/doc/administration/gitaly/_index.md
+++ b/doc/administration/gitaly/_index.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Gitaly and Gitaly Cluster
diff --git a/doc/administration/gitaly/bundle_uris.md b/doc/administration/gitaly/bundle_uris.md
index 79cf69b3004..c08a976f9a0 100644
--- a/doc/administration/gitaly/bundle_uris.md
+++ b/doc/administration/gitaly/bundle_uris.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Bundle URIs
diff --git a/doc/administration/gitaly/cgroups.md b/doc/administration/gitaly/cgroups.md
index a69440573c4..0a955a8d30f 100644
--- a/doc/administration/gitaly/cgroups.md
+++ b/doc/administration/gitaly/cgroups.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Cgroups
diff --git a/doc/administration/gitaly/concurrency_limiting.md b/doc/administration/gitaly/concurrency_limiting.md
index ebf59683e62..18e5e1b778d 100644
--- a/doc/administration/gitaly/concurrency_limiting.md
+++ b/doc/administration/gitaly/concurrency_limiting.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Concurrency limiting
diff --git a/doc/administration/gitaly/configure_gitaly.md b/doc/administration/gitaly/configure_gitaly.md
index 9529854fa9d..c3deb4adeb9 100644
--- a/doc/administration/gitaly/configure_gitaly.md
+++ b/doc/administration/gitaly/configure_gitaly.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Configure Gitaly
diff --git a/doc/administration/gitaly/consistency_checks.md b/doc/administration/gitaly/consistency_checks.md
index a462da3fd6a..0d3dc7fd2fa 100644
--- a/doc/administration/gitaly/consistency_checks.md
+++ b/doc/administration/gitaly/consistency_checks.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Repository consistency checks
diff --git a/doc/administration/gitaly/gitaly_geo_capabilities.md b/doc/administration/gitaly/gitaly_geo_capabilities.md
index 5b142a1c46a..00c6a823c8e 100644
--- a/doc/administration/gitaly/gitaly_geo_capabilities.md
+++ b/doc/administration/gitaly/gitaly_geo_capabilities.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Gitaly and Geo capabilities
diff --git a/doc/administration/gitaly/kubernetes.md b/doc/administration/gitaly/kubernetes.md
index 556c0e902e6..4b8484ad67f 100644
--- a/doc/administration/gitaly/kubernetes.md
+++ b/doc/administration/gitaly/kubernetes.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Gitaly on Kubernetes
diff --git a/doc/administration/gitaly/monitoring.md b/doc/administration/gitaly/monitoring.md
index e5259bee59f..1426c2cce2e 100644
--- a/doc/administration/gitaly/monitoring.md
+++ b/doc/administration/gitaly/monitoring.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Monitoring Gitaly and Gitaly Cluster
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index a4139d626a4..960b573d0e8 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Configure Gitaly Cluster
diff --git a/doc/administration/gitaly/recovery.md b/doc/administration/gitaly/recovery.md
index f6b6df97729..d8f6f12c46a 100644
--- a/doc/administration/gitaly/recovery.md
+++ b/doc/administration/gitaly/recovery.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Gitaly Cluster recovery options and tools
diff --git a/doc/administration/gitaly/reference.md b/doc/administration/gitaly/reference.md
index 5db73a46b23..3d2bee59d9a 100644
--- a/doc/administration/gitaly/reference.md
+++ b/doc/administration/gitaly/reference.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Example configuration files
diff --git a/doc/administration/gitaly/tls_support.md b/doc/administration/gitaly/tls_support.md
index db2091b7c2f..10519b5a5a2 100644
--- a/doc/administration/gitaly/tls_support.md
+++ b/doc/administration/gitaly/tls_support.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Gitaly TLS support
diff --git a/doc/administration/gitaly/troubleshooting.md b/doc/administration/gitaly/troubleshooting.md
index 00aba00906a..da64d3d732a 100644
--- a/doc/administration/gitaly/troubleshooting.md
+++ b/doc/administration/gitaly/troubleshooting.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Troubleshooting Gitaly
diff --git a/doc/administration/gitaly/troubleshooting_gitaly_cluster.md b/doc/administration/gitaly/troubleshooting_gitaly_cluster.md
index cba5347673d..4415854bdf5 100644
--- a/doc/administration/gitaly/troubleshooting_gitaly_cluster.md
+++ b/doc/administration/gitaly/troubleshooting_gitaly_cluster.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Troubleshooting Gitaly Cluster
diff --git a/doc/administration/housekeeping.md b/doc/administration/housekeeping.md
index 45fa53542ae..ac6b81728be 100644
--- a/doc/administration/housekeeping.md
+++ b/doc/administration/housekeeping.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Housekeeping
diff --git a/doc/administration/operations/moving_repositories.md b/doc/administration/operations/moving_repositories.md
index b6036ca9de9..27c53ffe02f 100644
--- a/doc/administration/operations/moving_repositories.md
+++ b/doc/administration/operations/moving_repositories.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Moving repositories managed by GitLab
diff --git a/doc/administration/raketasks/praefect.md b/doc/administration/raketasks/praefect.md
index 0a2921b7f1c..9573ce6b4d7 100644
--- a/doc/administration/raketasks/praefect.md
+++ b/doc/administration/raketasks/praefect.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Praefect Rake tasks
diff --git a/doc/administration/repository_checks.md b/doc/administration/repository_checks.md
index 3eb566a4374..eb6149161f9 100644
--- a/doc/administration/repository_checks.md
+++ b/doc/administration/repository_checks.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 gitlab_dedicated: yes
diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md
index d971f1d966b..3cd06a9109e 100644
--- a/doc/administration/repository_storage_paths.md
+++ b/doc/administration/repository_storage_paths.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Repository storage
diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md
index b503dba3af3..6ce9e295716 100644
--- a/doc/administration/server_hooks.md
+++ b/doc/administration/server_hooks.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Git server hooks
diff --git a/doc/administration/settings/account_and_limit_settings.md b/doc/administration/settings/account_and_limit_settings.md
index 1e2a20adc40..ce3b05c9038 100644
--- a/doc/administration/settings/account_and_limit_settings.md
+++ b/doc/administration/settings/account_and_limit_settings.md
@@ -85,85 +85,6 @@ This setting does not apply when pushing Git LFS objects.
 
 {{< /alert >}}
 
-## Personal access token prefix
-
-You can specify a prefix for personal access tokens. You might use a prefix
-to find tokens more quickly, or for use with automation tools.
-
-The default prefix is `glpat-` but administrators can change it.
-
-[Project access tokens](../../user/project/settings/project_access_tokens.md) and
-[group access tokens](../../user/group/settings/group_access_tokens.md) also inherit this prefix.
-
-By default, [secret push protection](../../user/application_security/secret_detection/secret_push_protection/_index.md) and
-[pipeline secret detection](../../user/application_security/secret_detection/pipeline/_index.md#detected-secrets) do not detect custom prefixes.
-Custom prefixes might cause an increase in false negatives.
-
-### Set a prefix
-
-To change the default global prefix:
-
-1. On the left sidebar, at the bottom, select **Admin**.
-1. Select **Settings > General**.
-1. Expand the **Account and limit** section.
-1. Fill in the **Personal access token prefix** field.
-1. Select **Save changes**.
-
-You can also configure the prefix by using the
-[settings API](../../api/settings.md).
-
-## Instance token prefix
-
-{{< history >}}
-
-- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179852) in GitLab 17.10 [with a flag](../feature_flags.md) named `custom_prefix_for_all_token_types`. Disabled by default.
-
-{{< /history >}}
-
-{{< alert type="flag" >}}
-
-The availability of this feature is controlled by a feature flag.
-For more information, see the history.
-This feature is available for testing, but not ready for production use.
-
-{{< /alert >}}
-
-You can set a custom prefix for all tokens generated on your instance.
-By default, GitLab uses `gl` as the instance prefix.
-
-Custom token prefixes apply only to the following tokens:
-
-- [Feed tokens](../../security/tokens/_index.md#feed-token)
-- [Deploy tokens](../../user/project/deploy_tokens/_index.md)
-- [Feature flags client tokens](../../operations/feature_flags.md#get-access-credentials)
-
-Prerequisites:
-
-- You must have administrator access to the instance.
-
-To set a custom token prefix:
-
-1. On the left sidebar, at the bottom, select **Admin**.
-1. Select **Settings > General**.
-1. Expand the **Account and limit** section.
-1. In the **Instance token prefix** field, enter your custom prefix.
-1. Select **Save changes**.
-
-{{< alert type="note" >}}
-
-By default, [secret push protection](../../user/application_security/secret_detection/secret_push_protection/_index.md), [client-side secret detection](../../user/application_security/secret_detection/client/_index.md) and
-[pipeline secret detection](../../user/application_security/secret_detection/pipeline/_index.md#detected-secrets) do not detect custom instance token prefixes. This may result in an increase in false negatives.
-
-{{< /alert >}}
-
-### Token prefix benefits
-
-Using custom token prefixes provides the following benefits:
-
-- Makes your tokens distinct and identifiable.
-- Helps identify leaked tokens during security scans.
-- Reduces the risk of token confusion between different instances.
-
 ## Repository size limit
 
 {{< details >}}
@@ -334,48 +255,6 @@ To set a limit on how long these sessions are valid:
 1. Fill in the **Session duration for Git operations when 2FA is enabled (minutes)** field.
 1. Select **Save changes**.
 
-## Require expiration dates for new access tokens
-
-{{< details >}}
-
-- Tier: Free, Premium, Ultimate
-- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
-
-{{< /details >}}
-
-{{< history >}}
-
-- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/470192) in GitLab 17.3.
-
-{{< /history >}}
-
-Prerequisites:
-
-- You must be an administrator.
-
-You can require all new access tokens to have an expiration date.
-This setting is turned on by default and applies to:
-
-- Project access tokens.
-- Group access tokens.
-- Personal access tokens for non-service account users.
-
-For personal access tokens for service accounts, use the `service_access_tokens_expiration_enforced`
-setting in the [Application Settings API](../../api/settings.md).
-
-To require expiration dates for new access tokens:
-
-1. On the left sidebar, at the bottom, select **Admin**.
-1. Select **Settings > General**.
-1. Expand **Account and limit**.
-1. Select the **Personal / Project / Group access token expiration** checkbox.
-1. Select **Save changes**.
-
-When you require expiration dates for new access tokens:
-
-- Users must set an expiration date that does not exceed the allowed lifetime for new access tokens.
-- To control the maximum access token lifetime, use the [**Limit the lifetime of access tokens** setting](#limit-the-lifetime-of-access-tokens).
-
 ## Allow top-level group Owners to create service accounts
 
 {{< details >}}
@@ -407,65 +286,127 @@ To allow top-level group Owners to create service accounts:
 1. Under **Service account creation**, select the **Allow top-level group owners to create Service accounts** checkbox.
 1. Select **Save changes**.
 
-## Limit the lifetime of SSH keys
+## Require expiration dates for new access tokens
 
 {{< details >}}
 
-- Tier: Ultimate
-- Offering: GitLab Self-Managed, GitLab Dedicated
+- Tier: Free, Premium, Ultimate
+- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
 
 {{< /details >}}
 
 {{< history >}}
 
-- [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/461901) the maximum allowable lifetime limit to an increased value of 400 days in GitLab 17.6 [with a flag](../feature_flags.md) named `buffered_token_expiration_limit`. Disabled by default.
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/470192) in GitLab 17.3.
+
+{{< /history >}}
+
+Prerequisites:
+
+- You must be an administrator.
+
+You can require all new access tokens to have an expiration date.
+This setting is turned on by default and applies to:
+
+- Personal access tokens for non-service account users.
+- Group access tokens.
+- Project access tokens.
+
+For personal access tokens for service accounts, use the `service_access_tokens_expiration_enforced`
+setting in the [Application Settings API](../../api/settings.md).
+
+To require expiration dates for new access tokens:
+
+1. On the left sidebar, at the bottom, select **Admin**.
+1. Select **Settings > General**.
+1. Expand **Account and limit**.
+1. Select the **Personal / Project / Group access token expiration** checkbox.
+1. Select **Save changes**.
+
+When you require expiration dates for new access tokens:
+
+- Users must set an expiration date that does not exceed the allowed lifetime for new access tokens.
+- To control the maximum access token lifetime, use the [**Limit the lifetime of access tokens** setting](#limit-the-lifetime-of-access-tokens).
+
+## Personal access token prefix
+
+You can specify a prefix for personal access tokens. You might use a prefix
+to find tokens more quickly, or for use with automation tools.
+
+The default prefix is `glpat-` but administrators can change it.
+
+[Project access tokens](../../user/project/settings/project_access_tokens.md) and
+[group access tokens](../../user/group/settings/group_access_tokens.md) also inherit this prefix.
+
+By default, [secret push protection](../../user/application_security/secret_detection/secret_push_protection/_index.md) and
+[pipeline secret detection](../../user/application_security/secret_detection/pipeline/_index.md#detected-secrets) do not detect custom prefixes.
+Custom prefixes might cause an increase in false negatives. To use custom instance prefixes with your pipeline secret detection ruleset, consider [extending the pipeline configuration](../../user/application_security/secret_detection/pipeline/configure.md#ignore-patterns-and-paths).
+
+### Set a prefix
+
+To change the default global prefix:
+
+1. On the left sidebar, at the bottom, select **Admin**.
+1. Select **Settings > General**.
+1. Expand the **Account and limit** section.
+1. Fill in the **Personal access token prefix** field.
+1. Select **Save changes**.
+
+You can also configure the prefix by using the
+[settings API](../../api/settings.md).
+
+## Instance token prefix
+
+{{< history >}}
+
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179852) in GitLab 17.10 [with a flag](../feature_flags.md) named `custom_prefix_for_all_token_types`. Disabled by default.
 
 {{< /history >}}
 
 {{< alert type="flag" >}}
 
-The availability of the extended maximum allowable lifetime limit is controlled by a feature flag.
+The availability of this feature is controlled by a feature flag.
 For more information, see the history.
-The feature flag is not available on GitLab Dedicated.
+This feature is available for testing, but not ready for production use.
 
 {{< /alert >}}
 
-Users can optionally specify a lifetime for
-[SSH keys](../../user/ssh.md).
-This lifetime is not a requirement, and can be set to any arbitrary number of days.
+You can set a custom prefix for all tokens generated on your instance.
+By default, GitLab uses `gl` as the instance prefix.
 
-SSH keys are user credentials to access GitLab.
-However, organizations with security requirements may want to enforce more protection by
-requiring the regular rotation of these keys.
+Custom token prefixes apply only to the following tokens:
 
-### Set a lifetime
+- [Feed tokens](../../security/tokens/_index.md#feed-token)
+- [Deploy tokens](../../user/project/deploy_tokens/_index.md)
+- [Feature flags client tokens](../../operations/feature_flags.md#get-access-credentials)
 
-Only a GitLab administrator can set a lifetime. Leaving it empty means
-there are no restrictions.
+Prerequisites:
 
-To set a lifetime on how long SSH keys are valid:
+- You must have administrator access to the instance.
+
+To set a custom token prefix:
 
 1. On the left sidebar, at the bottom, select **Admin**.
 1. Select **Settings > General**.
 1. Expand the **Account and limit** section.
-1. Fill in the **Maximum allowable lifetime for SSH keys (days)** field.
+1. In the **Instance token prefix** field, enter your custom prefix.
 1. Select **Save changes**.
 
-After a lifetime for SSH keys is set, GitLab:
-
-- Requires users to set an expiration date that is no later than the allowed lifetime on new SSH keys. The maximum allowed lifetime is:
-  - 365 days by default.
-  - 400 days, if you enable the `buffered_token_expiration_limit` feature flag.
-    This extended limit is not available on GitLab Dedicated.
-- Applies the lifetime restriction to existing SSH keys. Keys with no expiry or a lifetime
-  greater than the maximum immediately become invalid.
-
 {{< alert type="note" >}}
 
-When a user's SSH key becomes invalid they can delete and re-add the same key again.
+By default, [secret push protection](../../user/application_security/secret_detection/secret_push_protection/_index.md), [client-side secret detection](../../user/application_security/secret_detection/client/_index.md) and
+[pipeline secret detection](../../user/application_security/secret_detection/pipeline/_index.md#detected-secrets) do not detect custom instance token prefixes. This may result in an increase in false negatives. To use custom instance prefixes with your pipeline secret detection ruleset, consider [extending the pipeline configuration](../../user/application_security/secret_detection/pipeline/configure.md#ignore-patterns-and-paths).
 
 {{< /alert >}}
 
+### Token prefix benefits
+
+Using custom token prefixes provides the following benefits:
+
+- Makes your tokens distinct and identifiable.
+- Helps identify leaked tokens during security scans.
+- Reduces the risk of token confusion between different instances.
+
 ## Limit the lifetime of access tokens
 
 {{< details >}}
@@ -529,6 +470,65 @@ After a lifetime for access tokens is set, GitLab:
   allowed lifetime. Three hours is given to allow administrators to change the allowed lifetime,
   or remove it, before revocation takes place.
 
+## Limit the lifetime of SSH keys
+
+{{< details >}}
+
+- Tier: Ultimate
+- Offering: GitLab Self-Managed, GitLab Dedicated
+
+{{< /details >}}
+
+{{< history >}}
+
+- [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/461901) the maximum allowable lifetime limit to an increased value of 400 days in GitLab 17.6 [with a flag](../feature_flags.md) named `buffered_token_expiration_limit`. Disabled by default.
+
+{{< /history >}}
+
+{{< alert type="flag" >}}
+
+The availability of the extended maximum allowable lifetime limit is controlled by a feature flag.
+For more information, see the history.
+The feature flag is not available on GitLab Dedicated.
+
+{{< /alert >}}
+
+Users can optionally specify a lifetime for
+[SSH keys](../../user/ssh.md).
+This lifetime is not a requirement, and can be set to any arbitrary number of days.
+
+SSH keys are user credentials to access GitLab.
+However, organizations with security requirements may want to enforce more protection by
+requiring the regular rotation of these keys.
+
+### Set a lifetime
+
+Only a GitLab administrator can set a lifetime. Leaving it empty means
+there are no restrictions.
+
+To set a lifetime on how long SSH keys are valid:
+
+1. On the left sidebar, at the bottom, select **Admin**.
+1. Select **Settings > General**.
+1. Expand the **Account and limit** section.
+1. Fill in the **Maximum allowable lifetime for SSH keys (days)** field.
+1. Select **Save changes**.
+
+After a lifetime for SSH keys is set, GitLab:
+
+- Requires users to set an expiration date that is no later than the allowed lifetime on new SSH keys. The maximum allowed lifetime is:
+  - 365 days by default.
+  - 400 days, if you enable the `buffered_token_expiration_limit` feature flag.
+    This extended limit is not available on GitLab Dedicated.
+- Applies the lifetime restriction to existing SSH keys. Keys with no expiry or a lifetime
+  greater than the maximum immediately become invalid.
+
+{{< alert type="note" >}}
+
+When a user's SSH key becomes invalid they can delete and re-add the same key again.
+
+{{< /alert >}}
+
 ## User OAuth applications setting
 
 {{< details >}}
diff --git a/doc/administration/settings/gitaly_timeouts.md b/doc/administration/settings/gitaly_timeouts.md
index f43ff0e0894..32634fa9928 100644
--- a/doc/administration/settings/gitaly_timeouts.md
+++ b/doc/administration/settings/gitaly_timeouts.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Gitaly timeouts
diff --git a/doc/api/pipeline_schedules.md b/doc/api/pipeline_schedules.md
index 52d7cc5bd95..e89943754a5 100644
--- a/doc/api/pipeline_schedules.md
+++ b/doc/api/pipeline_schedules.md
@@ -195,7 +195,7 @@ POST /projects/:id/pipeline_schedules
 | `cron`          | string         | Yes      | The [cron](https://en.wikipedia.org/wiki/Cron) schedule, for example: `0 1 * * *`. |
 | `description`   | string         | Yes      | The description of the pipeline schedule. |
 | `id`            | integer/string | Yes      | The ID or [URL-encoded path of the project](rest/_index.md#namespaced-paths). |
-| `ref`           | string         | Yes      | The branch or tag name that is triggered. Both the short (e.g. `main`) and full (e.g. `refs/heads/main` or `refs/tags/main`) ref versions are accepted. If a short version is provided, it is automatically expanded to the full ref version but, if the ref is [ambiguous](../ci/pipelines/schedules.md#ambiguous-refs), it will be rejected |
+| `ref`           | string         | Yes      | The branch or tag name that is triggered. Both the short (for example: `main`) and full (for example: `refs/heads/main` or `refs/tags/main`) ref versions are accepted. If a short version is provided, it is automatically expanded to the full ref version but, if the ref is [ambiguous](../ci/pipelines/schedules.md#ambiguous-refs), it will be rejected |
 | `active`        | boolean        | No       | The activation of pipeline schedule. If false is set, the pipeline schedule is initially deactivated (default: `true`). |
 | `cron_timezone` | string         | No       | The time zone supported by `ActiveSupport::TimeZone`, for example: `Pacific Time (US & Canada)` (default: `UTC`). |
 | `inputs`        | hash           | No       | An array of [inputs](../ci/inputs/_index.md#for-a-pipeline) to pass to the pipeline schedule. Each input contains a `name` and `value`. Values can be strings, arrays, numbers, or booleans. |
@@ -259,7 +259,7 @@ PUT /projects/:id/pipeline_schedules/:pipeline_schedule_id
 | `cron_timezone`        | string         | No       | The time zone supported by `ActiveSupport::TimeZone` (for example `Pacific Time (US & Canada)`), or `TZInfo::Timezone` (for example `America/Los_Angeles`). |
 | `cron`                 | string         | No       | The [cron](https://en.wikipedia.org/wiki/Cron) schedule, for example: `0 1 * * *`. |
 | `description`          | string         | No       | The description of the pipeline schedule. |
-| `ref`                  | string         | No       | The branch or tag name that is triggered. Both the short (e.g. `main`) and full (e.g. `refs/heads/main` or `refs/tags/main`) ref versions are accepted. If a short version is provided, it is automatically expanded to the full ref version but, if the ref is [ambiguous](../ci/pipelines/schedules.md#ambiguous-refs), it will be rejected |
+| `ref`                  | string         | No       | The branch or tag name that is triggered. Both the short (for example: `main`) and full (for example: `refs/heads/main` or `refs/tags/main`) ref versions are accepted. If a short version is provided, it is automatically expanded to the full ref version but, if the ref is [ambiguous](../ci/pipelines/schedules.md#ambiguous-refs), it will be rejected |
 | `inputs`               | hash           | No       | An array of [inputs](../ci/inputs/_index.md) to pass to the pipeline schedule. Each input contains a `name` and `value`. To delete an existing input, include the `name` field and set `destroy` to `true`. Values can be strings, arrays, numbers, or booleans. |
 
 Example request:
diff --git a/doc/api/project_repository_storage_moves.md b/doc/api/project_repository_storage_moves.md
index fb3dc2eb16e..020915c69ea 100644
--- a/doc/api/project_repository_storage_moves.md
+++ b/doc/api/project_repository_storage_moves.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Project repository storage moves API
diff --git a/doc/api/settings.md b/doc/api/settings.md
index c20a89fbd1b..898da1117e2 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -391,6 +391,7 @@ these parameters:
 - `lock_duo_features_enabled`
 - `use_clickhouse_for_analytics`
 - `virtual_registries_endpoints_api_limit`
+- `lock_memberships_to_saml`
 
 Example responses:
 
@@ -602,6 +603,7 @@ to configure other related settings. These requirements are
 | `jira_connect_proxy_url`                 | string           | no                                   | URL of the GitLab instance used as a proxy for the GitLab for Jira Cloud app. |
 | `keep_latest_artifact`                   | boolean          | no                                   | Prevent the deletion of the artifacts from the most recent successful jobs, regardless of the expiry time. Enabled by default. |
 | `local_markdown_version`                 | integer          | no                                   | Increase this value when any cached Markdown should be invalidated. |
+| `lock_memberships_to_saml`               | boolean          | no                                   | Enforce a [global lock on SAML group memberships](../user/group/saml_sso/group_sync.md#global-saml-group-memberships-lock). |
 | `mailgun_signing_key`                    | string           | no                                   | The Mailgun HTTP webhook signing key for receiving events from webhook. |
 | `mailgun_events_enabled`                 | boolean          | no                                   | Enable Mailgun event receiver. |
 | `maintenance_mode_message`               | string           | no                                   | Message displayed when instance is in maintenance mode. Premium and Ultimate only. |
diff --git a/doc/ci/yaml/_index.md b/doc/ci/yaml/_index.md
index 62296d0ec30..cde2fd2a769 100644
--- a/doc/ci/yaml/_index.md
+++ b/doc/ci/yaml/_index.md
@@ -2490,9 +2490,9 @@ for an environment.
 
 **Supported values**:
 
-- `agent`: A string specifying the [GitLab agent for Kubernetes](../../user/clusters/agent/_index.md). The format is `path/to/agent/project:agent-name`.
-- `namespace`: A string representing the Kubernetes namespace. It needs to be set together with the `agent` keyword.
-- `flux_resource_path`: A string representing the path to the Flux resource. This must be the full resource path. It needs to be set together with the
+- `agent`: A string specifying the [GitLab agent for Kubernetes](../../user/clusters/agent/_index.md). The format is `path/to/agent/project:agent-name`. If the agent is connected to the project running the pipeline, use `$CI_PROJECT_PATH:agent-name`.
+- `namespace`: A string representing the Kubernetes namespace where the environment is deployed. The namespace must be set together with the `agent` keyword.
+- `flux_resource_path`: A string representing the full path to the Flux resource, such as a HelmRelease. The Flux resource must be set together with the
   `agent` and `namespace` keywords.
 
 **Example of `environment:kubernetes`**:
@@ -2506,14 +2506,17 @@ deploy:
     kubernetes:
       agent: path/to/agent/project:agent-name
       namespace: my-namespace
-      flux_resource_path: helm.toolkit.fluxcd.io/v2/namespaces/gitlab-agent/helmreleases/gitlab-agent
+      flux_resource_path: helm.toolkit.fluxcd.io/v2/namespaces/flux-system/helmreleases/helm-release-resource
 ```
 
-This configuration sets up the `deploy` job to deploy to the `production`
-environment, associates the [agent](../../user/clusters/agent/_index.md) named `agent-name` with the environment,
-and configures the [dashboard for Kubernetes](../environments/kubernetes_dashboard.md) for an environment with
+This configuration:
+
+- Sets up the `deploy` job to deploy to the `production`
+environment
+- Associates the [agent](../../user/clusters/agent/_index.md) named `agent-name` with the environment
+- Configures the [dashboard for Kubernetes](../environments/kubernetes_dashboard.md) for an environment with
 the namespace `my-namespace` and the `flux_resource_path` set to
-`helm.toolkit.fluxcd.io/v2/namespaces/gitlab-agent/helmreleases/gitlab-agent`.
+`helm.toolkit.fluxcd.io/v2/namespaces/flux-system/helmreleases/helm-release-resource`.
 
 **Additional details**:
 
@@ -2522,7 +2525,8 @@ the namespace `my-namespace` and the `flux_resource_path` set to
   [configure `user_access`](../../user/clusters/agent/user_access.md)
   for the environment's project or its parent group.
 - The user running the job must be authorized to access the cluster agent.
-  Otherwise, it will ignore `agent`, `namespace` and `flux_resource_path` attributes.
+  Otherwise, the dashboard ignores the `agent`, `namespace`, and `flux_resource_path` attributes.
+- If you only want to set the `agent`, you do not have to set the `namespace`, and cannot set `flux_resource_path`. However, this configuration lists all namespaces in a cluster in the dashboard for Kubernetes.
 
 #### `environment:deployment_tier`
 
diff --git a/doc/development/ai_features/actions.md b/doc/development/ai_features/actions.md
index 714d8b8962f..a6ce6a1e69c 100644
--- a/doc/development/ai_features/actions.md
+++ b/doc/development/ai_features/actions.md
@@ -184,7 +184,7 @@ prompt_template:
 ### Incremental rollout of prompt versions
 
 Once a stable prompt version is added to the AI Gateway it should not be altered. You can create a mutable version of a
-prompt by adding a pre-release suffix to the file name (e.g. `1.0.1-dev.yml`). This will also prevent it from being
+prompt by adding a pre-release suffix to the file name (for example, `1.0.1-dev.yml`). This will also prevent it from being
 automatically served to clients. Then you can use a feature flag to control the rollout this new version. For GitLab
 Duo Self-hosted, forced versions are ignored, and only versions defined in `PromptVersions` are used. This avoids
 mistakenly enabling versions for models that don't have that specified version.
diff --git a/doc/development/ai_features/ai_feature_development_playbook.md b/doc/development/ai_features/ai_feature_development_playbook.md
index 79a582b094f..d4e51c6512a 100644
--- a/doc/development/ai_features/ai_feature_development_playbook.md
+++ b/doc/development/ai_features/ai_feature_development_playbook.md
@@ -156,7 +156,7 @@ For an overview, see [this video](https://youtu.be/-DK-XFFllwg).
 1. ELI5 Setup Considerations
    - Requires upfront time investment
    - Need to adjust evaluations for specific features
-   - Set up input data (e.g., local GDK for chat features)
+   - Set up input data (for example, local GDK for chat features)
 
 1. Challenges
    - Ensuring consistent data across different users
diff --git a/doc/development/ai_features/code_suggestions.md b/doc/development/ai_features/code_suggestions.md
index 7a5f0b7592f..de6de4ce5f9 100644
--- a/doc/development/ai_features/code_suggestions.md
+++ b/doc/development/ai_features/code_suggestions.md
@@ -10,8 +10,8 @@ title: Code Suggestions development guidelines
 
 The recommended setup for locally developing and debugging Code Suggestions is to have all 3 different components running:
 
-- IDE Extension (e.g. GitLab Workflow extension for VS Code).
-- Main application configured correctly (e.g. GDK).
+- IDE Extension (for example, GitLab Workflow extension for VS Code).
+- Main application configured correctly (for example, GDK).
 - [AI gateway](https://gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist).
 
 This should enable everyone to locally see how any change made in an IDE is sent to the main application to be transformed into a prompt before being sent to the respective model.
diff --git a/doc/development/ai_features/duo_chat.md b/doc/development/ai_features/duo_chat.md
index ac0fbd38eb5..f4997b91d9d 100644
--- a/doc/development/ai_features/duo_chat.md
+++ b/doc/development/ai_features/duo_chat.md
@@ -316,7 +316,7 @@ While there are no strict guidelines for interpreting the comparison results, he
 
 In either of these scenarios, we recommend further investigation:
 
-1. Compare your results with [the daily evaluation results](https://gitlab.com/gitlab-org/modelops/ai-model-validation-and-research/ai-evaluation/evaluation-runner#view-daily-evaluation-result-on-master). e.g. look at the daily evaluations from yesterday and the day before.
+1. Compare your results with [the daily evaluation results](https://gitlab.com/gitlab-org/modelops/ai-model-validation-and-research/ai-evaluation/evaluation-runner#view-daily-evaluation-result-on-master). For instance, look at the daily evaluations from yesterday and the day before.
 1. If you observe similar patterns in these daily evaluations, it's likely that your merge request is safe to merge. However, if the patterns differ, it may indicate that your merge request has introduced unexpected changes.
 
 We strongly recommend running the regression evaluator in at least the following environments:
diff --git a/doc/development/ai_features/model_migration.md b/doc/development/ai_features/model_migration.md
index e1ec4e5e180..6bc60418d73 100644
--- a/doc/development/ai_features/model_migration.md
+++ b/doc/development/ai_features/model_migration.md
@@ -42,7 +42,7 @@ Model migrations typically follow these general timelines:
 
 - **Complex Migrations:** 1-2 months (full milestone or longer)
   - Example: Adding support for a new provider like AWS Bedrock
-  - Example: Major version upgrades with breaking changes (e.g., Claude 2 to 3)
+  - Example: Major version upgrades with breaking changes (for example, Claude 2 to 3)
   - Requires significant API integration work
   - May need infrastructure changes
 
diff --git a/doc/development/ai_features/testing_and_validation.md b/doc/development/ai_features/testing_and_validation.md
index f9e8d05cb5f..b32bb2ae36b 100644
--- a/doc/development/ai_features/testing_and_validation.md
+++ b/doc/development/ai_features/testing_and_validation.md
@@ -32,7 +32,7 @@ This command is responsible for seeding group and project resources for testing
 It's mainly used by the following scenarios:
 
 - Developers or UX designers have a local GDK but don't know how to set up the group and project resources to test a feature in UI.
-- Evaluators (e.g. CEF) have input dataset that refers to a group or project resource e.g. (`Summarize issue #123` requires a corresponding issue record in PosstgreSQL)
+- Evaluators (for example, CEF) have input dataset that refers to a group or project resource (for instance, `Summarize issue #123` requires a corresponding issue record in PostgreSQL)
 
 Currently, the input dataset of evaluators and this development seed file are managed separately.
 To ensure that the integration keeps working, this seeder has to create the **same** group/project resources every time.
diff --git a/doc/development/bulk_imports/contributing.md b/doc/development/bulk_imports/contributing.md
index 3a7505f17f2..1f2f9de3721 100644
--- a/doc/development/bulk_imports/contributing.md
+++ b/doc/development/bulk_imports/contributing.md
@@ -124,7 +124,7 @@ associations that require them. For example, documents must be imported before m
    - Anything that ends on `_id` or `_ids`
    - Anything that includes `attributes` (except `custom_attributes`)
    - Anything that ends on `_html`
-   - Anything sensitive (e.g. tokens, encrypted data)
+   - Anything sensitive (for example, tokens, encrypted data)
 
    See a full list of prohibited references [here](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/import_export/attribute_cleaner.rb#L14-21).
 
diff --git a/doc/development/contributing/img/ui_color_theme_after_v16_9.png b/doc/development/contributing/img/ui_color_theme_after_v16_9.png
deleted file mode 100644
index 40e160b2693..00000000000
Binary files a/doc/development/contributing/img/ui_color_theme_after_v16_9.png and /dev/null differ
diff --git a/doc/development/contributing/img/ui_color_theme_before_v16_9.png b/doc/development/contributing/img/ui_color_theme_before_v16_9.png
deleted file mode 100644
index b0f6bd28c3e..00000000000
Binary files a/doc/development/contributing/img/ui_color_theme_before_v16_9.png and /dev/null differ
diff --git a/doc/development/fe_guide/_index.md b/doc/development/fe_guide/_index.md
index 3361d045104..0531310849b 100644
--- a/doc/development/fe_guide/_index.md
+++ b/doc/development/fe_guide/_index.md
@@ -59,7 +59,7 @@ The application structure typically follows the pattern: `app/assets/javascripts
   - `constants.js` (shared variables)
   - `index.js` (file that injects the Vue app)
 
-There is always a top-level Vue component that acts as the “main” component and imports lower-level components to build a feature. In all cases, there is an accompanying file (often named index.js or app.js but often varies) that looks for the injection point on a Haml view (e.g., `#pipeline-schedules-app`) and mounts the Vue app to the page.
+There is always a top-level Vue component that acts as the “main” component and imports lower-level components to build a feature. In all cases, there is an accompanying file (often named index.js or app.js but often varies) that looks for the injection point on a Haml view (for example, `#pipeline-schedules-app`) and mounts the Vue app to the page.
 
 We achieve this by importing a JavaScript file like [`app/assets/javascripts/ci/pipeline_schedules/mount_pipeline_schedules_app.js`](https://gitlab.com/gitlab-org/gitlab/-/blob/4ce851345054dbf09956dabcc9b958ae8aab77bb/app/assets/javascripts/ci/pipeline_schedules/mount_pipeline_schedules_app.js) (which sets up the Vue app) into the related Haml view’s corresponding page bundle, such as [`app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js`](https://gitlab.com/gitlab-org/gitlab/-/blob/4ce851345054dbf09956dabcc9b958ae8aab77bb/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js).
 
diff --git a/doc/development/fe_guide/img/panel_error_v17_1.png b/doc/development/fe_guide/img/panel_error_v17_1.png
deleted file mode 100644
index 9ad6659caee..00000000000
Binary files a/doc/development/fe_guide/img/panel_error_v17_1.png and /dev/null differ
diff --git a/doc/development/fe_guide/img/panel_info_v17_1.png b/doc/development/fe_guide/img/panel_info_v17_1.png
deleted file mode 100644
index b27bb15a5ca..00000000000
Binary files a/doc/development/fe_guide/img/panel_info_v17_1.png and /dev/null differ
diff --git a/doc/development/fe_guide/img/panel_warning_v17_1.png b/doc/development/fe_guide/img/panel_warning_v17_1.png
deleted file mode 100644
index 113e788bef8..00000000000
Binary files a/doc/development/fe_guide/img/panel_warning_v17_1.png and /dev/null differ
diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md
index a138dbfadb9..8cbe5996e34 100644
--- a/doc/development/fe_guide/style/scss.md
+++ b/doc/development/fe_guide/style/scss.md
@@ -81,7 +81,7 @@ You can use the [important modifier](https://tailwindcss.com/docs/configuration#
 
 ##### Spacing and sizing CSS utility classes
 
-Spacing and sizing CSS utility classes (e.g. `margin`, `padding`, `width`, `height`) use our spacing scale defined in
+Spacing and sizing CSS utility classes (for example, `margin`, `padding`, `width`, `height`) use our spacing scale defined in
 [src/tokens/build/tailwind/tokens.cjs](https://gitlab.com/gitlab-org/gitlab-ui/-/blob/7c0fb4b07a0f0d0a58dd0137831412dbf53ea498/src/tokens/build/tailwind/tokens.cjs). See [https://gitlab-org.gitlab.io/frontend/tailwind-documentation/margin](https://gitlab-org.gitlab.io/frontend/tailwind-documentation/margin) for available CSS utility classes.
 
 **Example:** `gl-mt-5` is `margin-top: 1rem;`
diff --git a/doc/development/fe_guide/troubleshooting.md b/doc/development/fe_guide/troubleshooting.md
index 5a692dd00cd..5e558ed19f7 100644
--- a/doc/development/fe_guide/troubleshooting.md
+++ b/doc/development/fe_guide/troubleshooting.md
@@ -120,7 +120,7 @@ Missing field 'description' while writing result {
 1. The backend might not be returning the "description" field in the response for the "WorkItemWidgetDescription" type. Verify that your backend API is correctly sending the data as expected.
 1. Use the `cache.readQuery` method to inspect the contents of the Apollo Client cache. Verify that the "description" field is present in the cached data for the relevant query
 1. Open the error stack trace suggesting that the issue might be related to how Apollo Client is writing data to its cache. It's possible that the cache is not being updated correctly, leading to missing fields
-1. Add console logs within your Apollo Client code (e.g., before and after writing to the cache) to track the data being processed and identify where the "description" field might be missing.
+1. Add console logs within your Apollo Client code (for example, before and after writing to the cache) to track the data being processed and identify where the "description" field might be missing.
 
 **Solution**
 
diff --git a/doc/development/git_object_deduplication.md b/doc/development/git_object_deduplication.md
index eecefdf8826..6d39e18a878 100644
--- a/doc/development/git_object_deduplication.md
+++ b/doc/development/git_object_deduplication.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
 title: How Git object deduplication works in GitLab
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md
index 10d5dde4201..9a801b7178d 100644
--- a/doc/development/gitaly.md
+++ b/doc/development/gitaly.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
 title: Gitaly development guidelines
diff --git a/doc/development/secure_coding_guidelines.md b/doc/development/secure_coding_guidelines.md
index 4567e8e14bc..5fcddf98f7d 100644
--- a/doc/development/secure_coding_guidelines.md
+++ b/doc/development/secure_coding_guidelines.md
@@ -269,7 +269,7 @@ end
 
 #### Ruby from 3.2.0
 
-Ruby released [Regexp improvements against ReDoS in 3.2.0](https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/). ReDoS will no longer be an issue, with the exception of _"some kind of regular expressions, such as those including advanced features (e.g., back-references or look-around), or with a huge fixed number of repetitions"_.
+Ruby released [Regexp improvements against ReDoS in 3.2.0](https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/). ReDoS will no longer be an issue, with the exception of _"some kind of regular expressions, such as those including advanced features (like back-references or look-around), or with a huge fixed number of repetitions"_.
 
 [Until GitLab enforces a global Regexp timeout](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145679) you should pass an explicit timeout parameter, particularly when using advanced features or a large number of repetitions. For example:
 
diff --git a/doc/solutions/components/duo_workflow/duo_workflow_codestyle.md b/doc/solutions/components/duo_workflow/duo_workflow_codestyle.md
index 41afa24a371..3f145687501 100644
--- a/doc/solutions/components/duo_workflow/duo_workflow_codestyle.md
+++ b/doc/solutions/components/duo_workflow/duo_workflow_codestyle.md
@@ -89,7 +89,7 @@ The variables are defined directly in the `.gitlab/workflows/java-style-workflow
 
 The prompt must be configured to point to your organization's style guide repository. In the `java-style-prompt.md` file, replace the following variables:
 
-- `{{GITLAB_INSTANCE}}`: Your GitLab instance URL (e.g., `https://gitlab.example.com`)
+- `{{GITLAB_INSTANCE}}`: Your GitLab instance URL (for example, `https://gitlab.example.com`)
 - `{{STYLE_GUIDE_PROJECT_ID}}`: The GitLab project ID containing your Java style guide
 - `{{STYLE_GUIDE_PROJECT_NAME}}`: The display name for your style guide project
 - `{{STYLE_GUIDE_BRANCH}}`: The branch containing the most up-to-date style guide (default: main)
@@ -110,7 +110,7 @@ STYLE_GUIDE_PATH=coding-style/java/guidelines/java-coding-standards.md
 In the same `java-style-prompt.md` file, configure which files to apply the style guide to:
 
 - `{{TARGET_PROJECT_ID}}`: Your Java project's GitLab ID
-- `{{TARGET_FILES}}`: Specific files or patterns to target (e.g., "src/main/java/**/*.java")
+- `{{TARGET_FILES}}`: Specific files or patterns to target (for example, "src/main/java/**/*.java")
 
 Example:
 
@@ -143,7 +143,7 @@ Remember that this tool is meant to assist developers, not replace human judgmen
 
 1. **Create a Style Guide Issue**
 
-   - Create a new issue in your project (e.g., Issue #3)
+   - Create a new issue in your project (for example, Issue #3)
    - Include detailed information about the style guidelines to apply
    - Reference the external style guide repository if applicable
    - Specify requirements like:
diff --git a/doc/solutions/components/duo_workflow/img/duoworkflow_style_plan1_v17_10.png b/doc/solutions/components/duo_workflow/img/duoworkflow_style_plan1_v17_10.png
deleted file mode 100644
index bc5b4591503..00000000000
Binary files a/doc/solutions/components/duo_workflow/img/duoworkflow_style_plan1_v17_10.png and /dev/null differ
diff --git a/doc/solutions/components/duo_workflow/img/duoworkflow_style_plan_v17_10.png b/doc/solutions/components/duo_workflow/img/duoworkflow_style_plan_v17_10.png
deleted file mode 100644
index 30a073c2044..00000000000
Binary files a/doc/solutions/components/duo_workflow/img/duoworkflow_style_plan_v17_10.png and /dev/null differ
diff --git a/doc/solutions/components/oss_license_check.md b/doc/solutions/components/oss_license_check.md
index d99e901f442..75e20933995 100644
--- a/doc/solutions/components/oss_license_check.md
+++ b/doc/solutions/components/oss_license_check.md
@@ -58,8 +58,8 @@ If you don't have a security policy project yet, you'll need to create one and t
 1. Navigate to that group's **Secure > Policies** page.
 1. Click on **New policy**.
 1. Select **Scan execution policy**.
-1. Enter a name for your policy (e.g., "Dependency Scanning Policy").
-1. Enter a description (e.g., "Enforces dependency scanning to get a list of OSS licenses used").
+1. Enter a name for your policy (for example, "Dependency Scanning Policy").
+1. Enter a description (for example, "Enforces dependency scanning to get a list of OSS licenses used").
 1. Set the **Policy scope** by selecting either "All projects in this group" (and optionally set exceptions) or "Specific projects" (and select the projects from the dropdown).
 1. Under the **Actions** section, select "Dependency scanning" instead of "Secret Detection" (default).
 1. Under the **Conditions** section, you can optionally change "Triggers:" to "Schedules:" if you want to run the scan on a schedule instead of at every commit.
@@ -72,8 +72,8 @@ After setting up dependency scanning, follow these steps to set up the license c
 1. Navigate back to the same group's **Secure > Policies** page.
 1. Click on **New policy**.
 1. Select **Merge request approval policy**.
-1. Enter a name for your policy (e.g., "OSS Compliance Policy").
-1. Enter a description (e.g., "Block any licenses that are not included in the Blue Oak Council's Gold, Silver, or Bronze tiers").
+1. Enter a name for your policy (for example, "OSS Compliance Policy").
+1. Enter a description (for example, "Block any licenses that are not included in the Blue Oak Council's Gold, Silver, or Bronze tiers").
 1. Set the **Policy scope** by selecting either "All projects in this group" (and optionally set exceptions) or "Specific projects" (and select the projects from the dropdown).
 1. Under the **Rules** section, click the "Select scan type" dropdown and select **License Scan**.
 1. Set the target branches (default is all protected branches).
@@ -110,8 +110,8 @@ If you already have a security policy project but don't have dependency and/or l
    - Maintain the existing YAML structure
    - Place these sections at the same level as other top-level sections
    - Set `user_approvers_ids` and/or `group_approvers_ids` and/or `role_approvers` (only one is needed)
-     - Replace `YOUR_USER_ID_HERE` or `YOUR_GROUP_ID_HERE` with appropriate user/group IDs (ensure you paste the user/group IDs e.g. 1234567 and NOT the usernames)
-   - Replace `YOUR_PROJECT_ID_HERE` if you'd like to exclude any projects from the policy (ensure you paste the project IDs e.g. 1234 and NOT the project names/paths)
+     - Replace `YOUR_USER_ID_HERE` or `YOUR_GROUP_ID_HERE` with appropriate user/group IDs (ensure you paste the user/group IDs, for example, 1234567 and NOT the usernames)
+   - Replace `YOUR_PROJECT_ID_HERE` if you'd like to exclude any projects from the policy (ensure you paste the project IDs, for example, 1234 and NOT the project names/paths)
    - Set `approvals_required: 1` to the number of approvals you want to require
    - Modify the `approval_settings` section as needed (anything set to `true` will override project approval settings)
 1. Click **Commit changes**, and commit to a new branch. Select **Create a merge request for this change** so that the policy change can be merged.
@@ -350,8 +350,8 @@ approval_policy:
 ## Customization Options
 
 - **Approvers**: You can specify approvers in three ways:
-  - `user_approvers_ids`: Replace with the user IDs of individuals who should approve licenses (e.g., `1234567`)
-  - `group_approvers_ids`: Replace with the group IDs that contain approvers (e.g., `9876543`)
+  - `user_approvers_ids`: Replace with the user IDs of individuals who should approve licenses (for example, `1234567`)
+  - `group_approvers_ids`: Replace with the group IDs that contain approvers (for example, `9876543`)
   - `role_approvers`: Specify roles that can approve, options are `developer`, `maintainer`, or `owner`
 - **Project Exclusions**: Add project IDs to the `policy_scope.projects.excluding` section to exempt them from the policy
 - **Required approvals**: Change `approvals_required: 1` to require more approvals
diff --git a/doc/solutions/languages/_index.md b/doc/solutions/languages/_index.md
index 8a65a98e47b..67d1a054db1 100644
--- a/doc/solutions/languages/_index.md
+++ b/doc/solutions/languages/_index.md
@@ -5,7 +5,7 @@ info: This page is owned by the Solutions Architecture team.
 title: Coding Languages and Frameworks
 ---
 
-This section provides resource indexes and enablements around individual coding languages including any ecosystem technologies that surround them (e.g. dependency packaging frameworks)
+This section provides resource indexes and enablements around individual coding languages including any ecosystem technologies that surround them (for example, dependency packaging frameworks)
 
 ## Solutions categories
 
diff --git a/doc/subscriptions/img/license-file_v14_0.png b/doc/subscriptions/img/license-file_v14_0.png
deleted file mode 100644
index 6516b6b4476..00000000000
Binary files a/doc/subscriptions/img/license-file_v14_0.png and /dev/null differ
diff --git a/doc/subscriptions/img/license-overview_v14_0.png b/doc/subscriptions/img/license-overview_v14_0.png
deleted file mode 100644
index d008366fb65..00000000000
Binary files a/doc/subscriptions/img/license-overview_v14_0.png and /dev/null differ
diff --git a/doc/subscriptions/img/publicly-visible_v14_0.png b/doc/subscriptions/img/publicly-visible_v14_0.png
deleted file mode 100644
index 91e8780e18d..00000000000
Binary files a/doc/subscriptions/img/publicly-visible_v14_0.png and /dev/null differ
diff --git a/doc/tutorials/boards_for_standups/img/team_standup_board_empty_v17_8.png b/doc/tutorials/boards_for_standups/img/team_standup_board_empty_v17_8.png
deleted file mode 100644
index eabbf1fccb5..00000000000
Binary files a/doc/tutorials/boards_for_standups/img/team_standup_board_empty_v17_8.png and /dev/null differ
diff --git a/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png b/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png
deleted file mode 100644
index 114e87a61f1..00000000000
Binary files a/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png and /dev/null differ
diff --git a/doc/user/analytics/ci_cd_analytics.md b/doc/user/analytics/ci_cd_analytics.md
index d6f11009f2e..77c41fe2850 100644
--- a/doc/user/analytics/ci_cd_analytics.md
+++ b/doc/user/analytics/ci_cd_analytics.md
@@ -15,7 +15,7 @@ title: CI/CD analytics
 Use CI/CD analytics to gain insights into your pipeline performance and success rates.
 
 The CI/CD analytics page provides visualizations for critical CI/CD pipeline metrics directly in the GitLab UI.
-This helps development teams quickly understand the health and efficiency of their software development process.
+These visualizations can help development teams quickly understand the health and efficiency of their software development process.
 
 ## View CI/CD analytics
 
diff --git a/doc/user/application_security/dependency_scanning/migration_guide_to_sbom_based_scans.md b/doc/user/application_security/dependency_scanning/migration_guide_to_sbom_based_scans.md
index 52eec7d463e..81b92f8f663 100644
--- a/doc/user/application_security/dependency_scanning/migration_guide_to_sbom_based_scans.md
+++ b/doc/user/application_security/dependency_scanning/migration_guide_to_sbom_based_scans.md
@@ -238,7 +238,7 @@ Prerequisites:
 
 To migrate a Go project:
 
-- Ensure that your project provides a `go.mod` and a `go.graph` files. Configure the [`go mod graph` command](https://go.dev/ref/mod#go-mod-graph) from the Go Toolchains in a preceding CI/CD job (for example, `build`) to dynamically generate the `dependencies.lock` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+- Ensure that your project provides a `go.mod` and a `go.graph` files. Configure the [`go mod graph` command](https://go.dev/ref/mod#go-mod-graph) from the Go Toolchains in a preceding CI/CD job (for example: `build`) to dynamically generate the `dependencies.lock` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 See the [enablement instructions for Go](dependency_scanning_sbom/_index.md#go) for more details and examples.
 
@@ -260,7 +260,7 @@ To migrate a Gradle project:
 
 - Ensure that your project provides a `dependencies.lock` file. Configure the [Gradle Dependency Lock Plugin](https://github.com/nebula-plugins/gradle-dependency-lock-plugin) in your project and either:
   - Permanently integrate the plugin into your development workflow. This means committing the `dependencies.lock` file into your repository and updating it as you're making changes to your project dependencies.
-  - Use the command in a preceding CI/CD job (for example, `build`) to dynamically generate the `dependencies.lock` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+  - Use the command in a preceding CI/CD job (for example: `build`) to dynamically generate the `dependencies.lock` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 See the [enablement instructions for Gradle](dependency_scanning_sbom/_index.md#gradle) for more details and examples.
 
@@ -280,7 +280,7 @@ Prerequisites:
 
 To migrate a Maven project:
 
-- Ensure that your project provides a `maven.graph.json` file. Configure the [maven dependency plugin](https://maven.apache.org/plugins/maven-dependency-plugin/index.html) in a preceding CI/CD job (e.g. `build`) to dynamically generate the `maven.graph.json` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+- Ensure that your project provides a `maven.graph.json` file. Configure the [maven dependency plugin](https://maven.apache.org/plugins/maven-dependency-plugin/index.html) in a preceding CI/CD job (for example: `build`) to dynamically generate the `maven.graph.json` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 See the [enablement instructions for Maven](dependency_scanning_sbom/_index.md#maven) for more details and examples.
 
@@ -338,11 +338,11 @@ To migrate a pip project:
 
 - Ensure that your project provides a `requirements.txt` lockfile. Configure the [pip-compile command line tool](https://pip-tools.readthedocs.io/en/latest/cli/pip-compile/) in your project and either:
   - Permanently integrate the command line tool into your development workflow. This means committing the `requirements.txt` file into your repository and updating it as you're making changes to your project dependencies.
-  - Use the command line tool in a preceding CI/CD job (e.g. `build`) to dynamically generate the `requirements.txt` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+  - Use the command line tool in a preceding CI/CD job (for example: `build`) to dynamically generate the `requirements.txt` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 OR
 
-- Ensure that your project provides a `pipdeptree.json` lockfile. Configure the [pipdeptree command line utility](https://pypi.org/project/pipdeptree/) in a preceding CI/CD job (e.g. `build`) to dynamically generate the `pipdeptree.json` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+- Ensure that your project provides a `pipdeptree.json` lockfile. Configure the [pipdeptree command line utility](https://pypi.org/project/pipdeptree/) in a preceding CI/CD job (for example: `build`) to dynamically generate the `pipdeptree.json` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 See the [enablement instructions for pip](dependency_scanning_sbom/_index.md#pip) for more details and examples.
 
@@ -364,11 +364,11 @@ To migrate a Pipenv project:
 
 - Ensure that your project provides a `Pipfile.lock` file. Configure the [`pipenv lock` command](https://pipenv.pypa.io/en/latest/cli.html#graph) in your project and either:
   - Permanently integrate the command into your development workflow. This means committing the `Pipfile.lock` file into your repository and updating it as you're making changes to your project dependencies.
-  - Use the command in a preceding CI/CD job (for example, `build`) to dynamically generate the `Pipfile.lock` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+  - Use the command in a preceding CI/CD job (for example: `build`) to dynamically generate the `Pipfile.lock` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 OR
 
-- Ensure that your project provides a `pipenv.graph.json` file. Configure the [`pipenv graph` command](https://pipenv.pypa.io/en/latest/cli.html#graph) in a preceding CI/CD job (for example, `build`) to dynamically generate the `pipenv.graph.json` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+- Ensure that your project provides a `pipenv.graph.json` file. Configure the [`pipenv graph` command](https://pipenv.pypa.io/en/latest/cli.html#graph) in a preceding CI/CD job (for example: `build`) to dynamically generate the `pipenv.graph.json` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 See the [enablement instructions for Pipenv](dependency_scanning_sbom/_index.md#pipenv) for more details and examples.
 
@@ -422,7 +422,7 @@ Prerequisites:
 
 To migrate an sbt project:
 
-- Ensure that your project provides a `dependencies-compile.dot` file. Configure the [sbt-dependency-graph plugin](https://github.com/sbt/sbt-dependency-graph) in a preceding CI/CD job (e.g. `build`) to dynamically generate the `dependencies-compile.dot` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
+- Ensure that your project provides a `dependencies-compile.dot` file. Configure the [sbt-dependency-graph plugin](https://github.com/sbt/sbt-dependency-graph) in a preceding CI/CD job (for example: `build`) to dynamically generate the `dependencies-compile.dot` file and export it as an [artifact](../../../ci/jobs/job_artifacts.md) prior to running the Dependency Scanning job.
 
 See the [enablement instructions for sbt](dependency_scanning_sbom/_index.md#sbt) for more details and examples.
 
@@ -503,7 +503,7 @@ There are no additional steps to migrate a Yarn project to use the Dependency Sc
 ## Changes to CI/CD variables
 
 Most of the existing CI/CD variables are no longer relevant with the new Dependency Scanning analyzer so their values will be ignored.
-Unless these are also used to configure other security analyzers (for example, `ADDITIONAL_CA_CERT_BUNDLE`), you should remove them from your CI/CD configuration.
+Unless these are also used to configure other security analyzers (for example: `ADDITIONAL_CA_CERT_BUNDLE`), you should remove them from your CI/CD configuration.
 
 Remove the following CI/CD variables from your CI/CD configuration:
 
diff --git a/doc/user/application_security/sast/troubleshooting.md b/doc/user/application_security/sast/troubleshooting.md
index defaeafd8df..88fcdd0a37e 100644
--- a/doc/user/application_security/sast/troubleshooting.md
+++ b/doc/user/application_security/sast/troubleshooting.md
@@ -144,7 +144,7 @@ When a `spotbugs-sast` job is running you might get an error that states `java.l
 To try to resolve this issue you can:
 
 - Choose a lower [level of effort](_index.md#security-scanner-configuration).
-- Set the CI/CD variable `JAVA_OPTS` to replace the default `-XX:MaxRAMPercentage=80`, e.g. `-XX:MaxRAMPercentage=90`.
+- Set the CI/CD variable `JAVA_OPTS` to replace the default `-XX:MaxRAMPercentage=80` (for example: `-XX:MaxRAMPercentage=90`).
 - [Tag a larger runner](../../../ci/runners/hosted_runners/linux.md#machine-types-available-for-linux---x86-64) in your `spotbugs-sast` job.
 
 #### Related topics
diff --git a/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png b/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png
deleted file mode 100644
index b253fe336ee..00000000000
Binary files a/doc/user/group/issues_analytics/img/enhanced_issue_analytics_v16_7.png and /dev/null differ
diff --git a/doc/user/packages/package_registry/pypi_cosign_tutorial.md b/doc/user/packages/package_registry/pypi_cosign_tutorial.md
index f3120ba91f9..5b3114b177d 100644
--- a/doc/user/packages/package_registry/pypi_cosign_tutorial.md
+++ b/doc/user/packages/package_registry/pypi_cosign_tutorial.md
@@ -466,10 +466,10 @@ As an end user, you can verify package signatures with the following steps:
 
    # Download signatures from GitLab's generic package registry
    # Replace these values with your project's details:
-   # GITLAB_URL: Your GitLab instance URL (e.g., https://gitlab.com)
+   # GITLAB_URL: Your GitLab instance URL (for example, https://gitlab.com)
    # PROJECT_ID: Your project's ID number
    # PACKAGE_NAME: Your package name
-   # VERSION: Package version (e.g., 1.0.0)
+   # VERSION: Package version (for example, 1.0.0)
    # FILENAME: The exact filename of your downloaded package
 
    curl --output "${FILENAME}.sig" \
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index a191b62103e..a6944210fda 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -57,6 +57,194 @@ By default, all users can create top-level groups and change their
 usernames. A GitLab administrator can [change this behavior](../administration/user_settings.md)
 for the GitLab instance.
 
+## Group members permissions
+
+Any user can remove themselves from a group, unless they are the only Owner of
+the group.
+
+The following table lists group permissions available for each role:
+
+### Analytics group permissions
+
+Group permission for [analytics](analytics/_index.md) features including value streams, product analytics, and insights:
+
+| Action                                                             | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ------------------------------------------------------------------ | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| View [Insights](project/insights/_index.md)                         |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View [Insights](project/insights/_index.md) charts                  |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View [Issue analytics](group/issues_analytics/_index.md)           |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View Contribution analytics                                        |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View value stream analytics                                        |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View [Productivity analytics](analytics/productivity_analytics.md) |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View [Group DevOps Adoption](group/devops_adoption/_index.md)      |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| View metrics dashboard annotations                                 |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| Create/edit/delete metrics dashboard annotations                   |       |         |          |     ✓     |     ✓      |   ✓   |       |
+
+### Application security group permissions
+
+Group permissions for [Application Security](application_security/secure_your_application.md) features including dependency management, security analyzers, security policies, and vulnerability management.
+
+| Action                                                                          | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ------------------------------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| View [dependency list](application_security/dependency_list/_index.md)           |       |         |          |     ✓     |     ✓      |   ✓   |       |
+| View [vulnerability report](application_security/vulnerability_report/_index.md) |       |         |          |     ✓     |     ✓      |   ✓   |       |
+| View [security dashboard](application_security/security_dashboard/_index.md)     |       |         |          |     ✓     |     ✓      |   ✓   |       |
+| Create [security policy project](application_security/policies/_index.md)        |       |         |          |           |            |   ✓   |       |
+| Assign [security policy project](application_security/policies/_index.md)        |       |         |          |           |            |   ✓   |       |
+
+### CI/CD group permissions
+
+Group permissions for [CI/CD](../ci/_index.md) features including runners, variables, and protected environments:
+
+| Action                                | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| View group runners                    |       |         |          |           |     ✓      |   ✓   |       |
+| Manage group-level Kubernetes cluster |       |         |          |           |     ✓      |   ✓   |       |
+| Manage group runners                  |       |         |          |           |            |   ✓   |       |
+| Manage group level CI/CD variables    |       |         |          |           |            |   ✓   |       |
+| Manage group protected environments   |       |         |          |           |            |   ✓   |       |
+
+### Compliance group permissions
+
+Group permissions for [compliance](compliance/_index.md) features including compliance center, audit events, compliance frameworks, and licenses.
+
+| Action                                                                                | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ------------------------------------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| View [audit events](compliance/audit_events.md)                                       |       |         |          |     ✓     |     ✓      |   ✓   | Users can view only events based on their individual actions. For more details, see the [prerequisites](compliance/audit_events.md#prerequisites). |
+| View licenses in the [dependency list](application_security/dependency_list/_index.md) |       |         |          |     ✓     |     ✓      |   ✓   |       |
+| View the [compliance center](compliance/compliance_center/_index.md)                  |       |         |          |           |            |   ✓   |       |
+| Manage [compliance frameworks](compliance/compliance_frameworks.md)                        |       |         |          |           |            |   ✓   |       |
+| Assign [compliance frameworks](compliance/compliance_frameworks.md) to projects            |       |         |          |           |            |   ✓   |       |
+| Manage [audit streams](compliance/audit_event_streaming.md)                           |       |         |          |           |            |   ✓   |       |
+
+### GitLab Duo group permissions
+
+Group permissions for [GitLab Duo](gitlab_duo/_index.md):
+
+| Action                                                                                                    | Non-member | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| --------------------------------------------------------------------------------------------------------- | :--------: | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| Use Duo features                                                                                          |            |       |         |    ✓     |     ✓     |     ✓      |   ✓   | Requires [user being assigned a seat to gain access to a Duo add-on](../subscriptions/subscription-add-ons.md#assign-gitlab-duo-seats). |
+| Configure [Duo feature availability](gitlab_duo/turn_on_off.md#for-a-group-or-subgroup)                      |            |       |         |          |           |     ✓      |   ✓   |       |
+| Configure [GitLab Duo Self Hosted](../administration/gitlab_duo_self_hosted/configure_duo_features.md)            |            |       |         |          |           |            |   ✓   |       |
+| Enable [beta and experimental features](gitlab_duo/turn_on_off.md#turn-on-beta-and-experimental-features) |            |       |         |          |           |            |   ✓   |       |
+| Purchase [Duo seats](../subscriptions/subscription-add-ons.md#purchase-additional-gitlab-duo-seats)       |            |       |         |          |           |            |   ✓   |       |
+
+### Groups group permissions
+
+Group permissions for [group features](group/_index.md):
+
+| Action                                                                                      | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|---------------------------------------------------------------------------------------------|:-----:|:-------:|:--------:|:---------:|:----------:|:-----:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Browse group                                                                                |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| [Search](search/_index.md) projects in group                                                |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| View group [audit events](compliance/audit_events.md)                                       |       |         |          |     ✓     |     ✓      |   ✓   | Developers and Maintainers can only view events based on their individual actions. For more details, see the [prerequisites](compliance/audit_events.md#prerequisites).                                                                                                                                                                                                                                                                                                                                                              |
+| Create project in group                                                                     |       |         |          |     ✓     |     ✓      |   ✓   | Developers, Maintainers and Owners: Only if the project creation role is set [for the instance](../administration/settings/visibility_and_access_controls.md#define-which-roles-can-create-projects) or [for the group](group/_index.md#specify-who-can-add-projects-to-a-group).<br><br>Developers: Developers can push commits to the default branch of a new project only if the [default branch protection](group/manage.md#change-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected". |
+| Create subgroup                                                                             |       |         |          |           |     ✓      |   ✓   | Maintainers: Only if users with the Maintainer role [can create subgroups](group/subgroups/_index.md#change-who-can-create-subgroups).                                                                                                                                                                                                                                                                                                                                                                                               |
+| Change custom settings for [project integrations](project/integrations/_index.md)           |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Edit [epic](group/epics/_index.md) comments (posted by any user)                            |       |    ✓    |          |           |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Fork project into a group                                                                   |       |         |          |           |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| View [Billing](../subscriptions/manage_subscription.md#view-subscription)           |       |         |          |           |            |   ✓   | Does not apply to subgroups                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| View group [Usage Quotas](storage_usage_quotas.md) page                                     |       |         |          |           |            |   ✓   | Does not apply to subgroups                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| [Migrate group](group/import/_index.md)                                                     |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Delete group                                                                                |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Manage [subscriptions, storage, and compute minutes](../subscriptions/gitlab_com/_index.md) |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Manage [group access tokens](group/settings/group_access_tokens.md)                         |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Change group visibility level                                                               |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Edit group settings                                                                         |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Configure project templates                                                                 |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Configure [SAML SSO](group/saml_sso/_index.md)                                              |       |         |          |           |            |   ✓   | Does not apply to subgroups                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| Disable notification emails                                                                 |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+
+### Project planning group permissions
+
+Group permissions for project planning features including iterations, milestones, and labels:
+
+| Action                  | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ----------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| Manage group labels     |       |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| Manage group milestones |       |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| Manage iterations       |       |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+
+Group permissions for [epics](group/epics/_index.md):
+
+| Action                                                                        | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes                                                                                                             |
+|-------------------------------------------------------------------------------|:-----:|:-------:|:--------:|:---------:|:----------:|:-----:|-------------------------------------------------------------------------------------------------------------------|
+| View epic                                                                     | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
+| [Search](search/_index.md) epics                                              | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic).                    |
+| Create epic                                                                   |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
+| Edit epic, including metadata, item locking, and resolving threads            |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
+| Delete epic                                                                   |       | ✓       |          |           |            | ✓     |                                                                                                                   |
+| Manage [epic boards](group/epics/epic_boards.md)                              |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
+| Add issue to an [epic](group/epics/_index.md)                                 | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic) and edit the issue. |
+| Add/remove [child epics](group/epics/manage_epics.md#multi-level-child-epics) | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | You must have permission to [view](group/epics/manage_epics.md#who-can-view-an-epic) the parent and child epics.  |
+| Add internal note                                                             |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
+
+Group permissions for [wikis](project/wiki/group.md):
+
+| Action                                 | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes                                                                                                                       |
+|----------------------------------------|:-----:|:-------:|:--------:|:---------:|:----------:|:-----:|-----------------------------------------------------------------------------------------------------------------------------|
+| View group wiki                        |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   | Guests: In addition, if your group is public or internal, all users who can see the group can also see group wiki pages.    |
+| [Search](search/_index.md) group wikis |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   | Guests: In addition, if your group is public or internal, all users who can see the group can also search group wiki pages. |
+| Create group wiki pages                |       |    ✓    |          |     ✓     |     ✓      |   ✓   |                                                                                                                             |
+| Edit group wiki pages                  |       |    ✓    |          |     ✓     |     ✓      |   ✓   |                                                                                                                             |
+| Delete group wiki pages                |       |    ✓    |          |     ✓     |     ✓      |   ✓   |                                                                                                                             |
+
+### Packages and registries group permissions
+
+Group permissions for [container registry](packages/_index.md):
+
+| Action                                            | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| Pull a container registry image                   |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   | Guests can only view events based on their individual actions. |
+| Pull a container image using the dependency proxy |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| Delete a container registry image                 |       |         |          |     ✓     |     ✓      |   ✓   |       |
+
+Group permissions for [package registry](packages/_index.md):
+
+| Action                                   | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ---------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| Pull packages                            |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
+| Publish packages                         |       |         |          |     ✓     |     ✓      |   ✓   |       |
+| Delete packages                          |       |         |          |           |     ✓      |   ✓   |       |
+| Manage package settings                  |       |         |          |           |            |   ✓   |       |
+| Manage dependency proxy cleanup policies |       |         |          |           |            |   ✓   |       |
+| Enable dependency proxy                  |       |         |          |           |            |   ✓   |       |
+| Disable dependency proxy                 |       |         |          |           |            |   ✓   |       |
+| Purge the dependency proxy for a group   |       |         |          |           |            |   ✓   |       |
+| Enable package request forwarding        |       |         |          |           |            |   ✓   |       |
+| Disable package request forwarding       |       |         |          |           |            |   ✓   |       |
+
+### Repository group permissions
+
+Group permissions for [repository](project/repository/_index.md) features including merge requests, push rules, and deploy tokens.
+
+| Action                                                                                 | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| -------------------------------------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| Manage [deploy tokens](project/deploy_tokens/_index.md)                                 |       |         |          |           |            |   ✓   |       |
+| Manage [merge request settings](group/manage.md#group-merge-request-approval-settings) |       |         |          |           |            |   ✓   |       |
+| Manage [push rules](group/access_and_permissions.md#group-push-rules)                  |       |         |          |           |            |   ✓   |       |
+
+### User management group permissions
+
+Group permissions for user management:
+
+| Action                          | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| ------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| View 2FA status of members      |       |         |          |           |            |   ✓   |       |
+| Manage group members            |       |         |          |           |            |   ✓   |       |
+| Manage group-level custom roles |       |         |          |           |            |   ✓   |       |
+| Share (invite) groups to groups |       |         |          |           |            |   ✓   |       |
+| Filter members by 2FA status    |       |         |          |           |            |   ✓   |       |
+
+### Workspace group permissions
+
+Groups permissions for workspaces:
+
+| Action                                                    | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
+| --------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
+| View workspace cluster agents mapped to a group           |       |         |          |           |     ✓      |   ✓   |       |
+| Map or unmap workspace cluster agents to and from a group |       |         |          |           |            |   ✓   |       |
+
 ## Project members permissions
 
 A user's role determines what permissions they have on a project. The Owner role provides all permissions but is
@@ -425,194 +613,6 @@ Project permissions for [GitLab Duo](gitlab_duo/_index.md):
 | Use Duo features                                                                       |            | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | Code Suggestions requires a [user being assigned a seat to gain access to a Duo add-on](../subscriptions/subscription-add-ons.md#assign-gitlab-duo-seats). |
 | Configure [Duo feature availability](gitlab_duo/turn_on_off.md#for-a-project) |            |       |         |          |           | ✓          | ✓     |       |
 
-## Group members permissions
-
-Any user can remove themselves from a group, unless they are the only Owner of
-the group.
-
-The following table lists group permissions available for each role:
-
-### Analytics group permissions
-
-Group permission for [analytics](analytics/_index.md) features including value streams, product analytics, and insights:
-
-| Action                                                             | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ------------------------------------------------------------------ | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| View [Insights](project/insights/_index.md)                         |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View [Insights](project/insights/_index.md) charts                  |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View [Issue analytics](group/issues_analytics/_index.md)           |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View Contribution analytics                                        |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View value stream analytics                                        |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View [Productivity analytics](analytics/productivity_analytics.md) |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View [Group DevOps Adoption](group/devops_adoption/_index.md)      |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| View metrics dashboard annotations                                 |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| Create/edit/delete metrics dashboard annotations                   |       |         |          |     ✓     |     ✓      |   ✓   |       |
-
-### Application security group permissions
-
-Group permissions for [Application Security](application_security/secure_your_application.md) features including dependency management, security analyzers, security policies, and vulnerability management.
-
-| Action                                                                          | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ------------------------------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| View [dependency list](application_security/dependency_list/_index.md)           |       |         |          |     ✓     |     ✓      |   ✓   |       |
-| View [vulnerability report](application_security/vulnerability_report/_index.md) |       |         |          |     ✓     |     ✓      |   ✓   |       |
-| View [security dashboard](application_security/security_dashboard/_index.md)     |       |         |          |     ✓     |     ✓      |   ✓   |       |
-| Create [security policy project](application_security/policies/_index.md)        |       |         |          |           |            |   ✓   |       |
-| Assign [security policy project](application_security/policies/_index.md)        |       |         |          |           |            |   ✓   |       |
-
-### CI/CD group permissions
-
-Group permissions for [CI/CD](../ci/_index.md) features including runners, variables, and protected environments:
-
-| Action                                | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| View group runners                    |       |         |          |           |     ✓      |   ✓   |       |
-| Manage group-level Kubernetes cluster |       |         |          |           |     ✓      |   ✓   |       |
-| Manage group runners                  |       |         |          |           |            |   ✓   |       |
-| Manage group level CI/CD variables    |       |         |          |           |            |   ✓   |       |
-| Manage group protected environments   |       |         |          |           |            |   ✓   |       |
-
-### Compliance group permissions
-
-Group permissions for [compliance](compliance/_index.md) features including compliance center, audit events, compliance frameworks, and licenses.
-
-| Action                                                                                | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ------------------------------------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| View [audit events](compliance/audit_events.md)                                       |       |         |          |     ✓     |     ✓      |   ✓   | Users can view only events based on their individual actions. For more details, see the [prerequisites](compliance/audit_events.md#prerequisites). |
-| View licenses in the [dependency list](application_security/dependency_list/_index.md) |       |         |          |     ✓     |     ✓      |   ✓   |       |
-| View the [compliance center](compliance/compliance_center/_index.md)                  |       |         |          |           |            |   ✓   |       |
-| Manage [compliance frameworks](compliance/compliance_frameworks.md)                        |       |         |          |           |            |   ✓   |       |
-| Assign [compliance frameworks](compliance/compliance_frameworks.md) to projects            |       |         |          |           |            |   ✓   |       |
-| Manage [audit streams](compliance/audit_event_streaming.md)                           |       |         |          |           |            |   ✓   |       |
-
-### GitLab Duo group permissions
-
-Group permissions for [GitLab Duo](gitlab_duo/_index.md):
-
-| Action                                                                                                    | Non-member | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| --------------------------------------------------------------------------------------------------------- | :--------: | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| Use Duo features                                                                                          |            |       |         |    ✓     |     ✓     |     ✓      |   ✓   | Requires [user being assigned a seat to gain access to a Duo add-on](../subscriptions/subscription-add-ons.md#assign-gitlab-duo-seats). |
-| Configure [Duo feature availability](gitlab_duo/turn_on_off.md#for-a-group-or-subgroup)                      |            |       |         |          |           |     ✓      |   ✓   |       |
-| Configure [GitLab Duo Self Hosted](../administration/gitlab_duo_self_hosted/configure_duo_features.md)            |            |       |         |          |           |            |   ✓   |       |
-| Enable [beta and experimental features](gitlab_duo/turn_on_off.md#turn-on-beta-and-experimental-features) |            |       |         |          |           |            |   ✓   |       |
-| Purchase [Duo seats](../subscriptions/subscription-add-ons.md#purchase-additional-gitlab-duo-seats)       |            |       |         |          |           |            |   ✓   |       |
-
-### Groups group permissions
-
-Group permissions for [group features](group/_index.md):
-
-| Action                                                                                      | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|---------------------------------------------------------------------------------------------|:-----:|:-------:|:--------:|:---------:|:----------:|:-----:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Browse group                                                                                |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| [Search](search/_index.md) projects in group                                                |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| View group [audit events](compliance/audit_events.md)                                       |       |         |          |     ✓     |     ✓      |   ✓   | Developers and Maintainers can only view events based on their individual actions. For more details, see the [prerequisites](compliance/audit_events.md#prerequisites).                                                                                                                                                                                                                                                                                                                                                              |
-| Create project in group                                                                     |       |         |          |     ✓     |     ✓      |   ✓   | Developers, Maintainers and Owners: Only if the project creation role is set [for the instance](../administration/settings/visibility_and_access_controls.md#define-which-roles-can-create-projects) or [for the group](group/_index.md#specify-who-can-add-projects-to-a-group).<br><br>Developers: Developers can push commits to the default branch of a new project only if the [default branch protection](group/manage.md#change-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected". |
-| Create subgroup                                                                             |       |         |          |           |     ✓      |   ✓   | Maintainers: Only if users with the Maintainer role [can create subgroups](group/subgroups/_index.md#change-who-can-create-subgroups).                                                                                                                                                                                                                                                                                                                                                                                               |
-| Change custom settings for [project integrations](project/integrations/_index.md)           |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Edit [epic](group/epics/_index.md) comments (posted by any user)                            |       |    ✓    |          |           |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Fork project into a group                                                                   |       |         |          |           |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| View [Billing](../subscriptions/manage_subscription.md#view-subscription)           |       |         |          |           |            |   ✓   | Does not apply to subgroups                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| View group [Usage Quotas](storage_usage_quotas.md) page                                     |       |         |          |           |            |   ✓   | Does not apply to subgroups                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| [Migrate group](group/import/_index.md)                                                     |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Delete group                                                                                |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Manage [subscriptions, storage, and compute minutes](../subscriptions/gitlab_com/_index.md) |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Manage [group access tokens](group/settings/group_access_tokens.md)                         |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Change group visibility level                                                               |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Edit group settings                                                                         |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Configure project templates                                                                 |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Configure [SAML SSO](group/saml_sso/_index.md)                                              |       |         |          |           |            |   ✓   | Does not apply to subgroups                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| Disable notification emails                                                                 |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-
-### Project planning group permissions
-
-Group permissions for project planning features including iterations, milestones, and labels:
-
-| Action                  | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ----------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| Manage group labels     |       |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| Manage group milestones |       |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| Manage iterations       |       |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-
-Group permissions for [epics](group/epics/_index.md):
-
-| Action                                                                        | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes                                                                                                             |
-|-------------------------------------------------------------------------------|:-----:|:-------:|:--------:|:---------:|:----------:|:-----:|-------------------------------------------------------------------------------------------------------------------|
-| View epic                                                                     | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
-| [Search](search/_index.md) epics                                              | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic).                    |
-| Create epic                                                                   |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
-| Edit epic, including metadata, item locking, and resolving threads            |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
-| Delete epic                                                                   |       | ✓       |          |           |            | ✓     |                                                                                                                   |
-| Manage [epic boards](group/epics/epic_boards.md)                              |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
-| Add issue to an [epic](group/epics/_index.md)                                 | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic) and edit the issue. |
-| Add/remove [child epics](group/epics/manage_epics.md#multi-level-child-epics) | ✓     | ✓       | ✓        | ✓         | ✓          | ✓     | You must have permission to [view](group/epics/manage_epics.md#who-can-view-an-epic) the parent and child epics.  |
-| Add internal note                                                             |       | ✓       | ✓        | ✓         | ✓          | ✓     |                                                                                                                   |
-
-Group permissions for [wikis](project/wiki/group.md):
-
-| Action                                 | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes                                                                                                                       |
-|----------------------------------------|:-----:|:-------:|:--------:|:---------:|:----------:|:-----:|-----------------------------------------------------------------------------------------------------------------------------|
-| View group wiki                        |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   | Guests: In addition, if your group is public or internal, all users who can see the group can also see group wiki pages.    |
-| [Search](search/_index.md) group wikis |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   | Guests: In addition, if your group is public or internal, all users who can see the group can also search group wiki pages. |
-| Create group wiki pages                |       |    ✓    |          |     ✓     |     ✓      |   ✓   |                                                                                                                             |
-| Edit group wiki pages                  |       |    ✓    |          |     ✓     |     ✓      |   ✓   |                                                                                                                             |
-| Delete group wiki pages                |       |    ✓    |          |     ✓     |     ✓      |   ✓   |                                                                                                                             |
-
-### Packages and registries group permissions
-
-Group permissions for [container registry](packages/_index.md):
-
-| Action                                            | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| Pull a container registry image                   |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   | Guests can only view events based on their individual actions. |
-| Pull a container image using the dependency proxy |   ✓   |    ✓    |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| Delete a container registry image                 |       |         |          |     ✓     |     ✓      |   ✓   |       |
-
-Group permissions for [package registry](packages/_index.md):
-
-| Action                                   | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ---------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| Pull packages                            |       |         |    ✓     |     ✓     |     ✓      |   ✓   |       |
-| Publish packages                         |       |         |          |     ✓     |     ✓      |   ✓   |       |
-| Delete packages                          |       |         |          |           |     ✓      |   ✓   |       |
-| Manage package settings                  |       |         |          |           |            |   ✓   |       |
-| Manage dependency proxy cleanup policies |       |         |          |           |            |   ✓   |       |
-| Enable dependency proxy                  |       |         |          |           |            |   ✓   |       |
-| Disable dependency proxy                 |       |         |          |           |            |   ✓   |       |
-| Purge the dependency proxy for a group   |       |         |          |           |            |   ✓   |       |
-| Enable package request forwarding        |       |         |          |           |            |   ✓   |       |
-| Disable package request forwarding       |       |         |          |           |            |   ✓   |       |
-
-### Repository group permissions
-
-Group permissions for [repository](project/repository/_index.md) features including merge requests, push rules, and deploy tokens.
-
-| Action                                                                                 | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| -------------------------------------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| Manage [deploy tokens](project/deploy_tokens/_index.md)                                 |       |         |          |           |            |   ✓   |       |
-| Manage [merge request settings](group/manage.md#group-merge-request-approval-settings) |       |         |          |           |            |   ✓   |       |
-| Manage [push rules](group/access_and_permissions.md#group-push-rules)                  |       |         |          |           |            |   ✓   |       |
-
-### User management group permissions
-
-Group permissions for user management:
-
-| Action                          | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| ------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| View 2FA status of members      |       |         |          |           |            |   ✓   |       |
-| Manage group members            |       |         |          |           |            |   ✓   |       |
-| Manage group-level custom roles |       |         |          |           |            |   ✓   |       |
-| Share (invite) groups to groups |       |         |          |           |            |   ✓   |       |
-| Filter members by 2FA status    |       |         |          |           |            |   ✓   |       |
-
-### Workspace group permissions
-
-Groups permissions for workspaces:
-
-| Action                                                    | Guest | Planner | Reporter | Developer | Maintainer | Owner | Notes |
-| --------------------------------------------------------- | :---: | :-----: | :------: | :-------: | :--------: | :---: | ----- |
-| View workspace cluster agents mapped to a group           |       |         |          |           |     ✓      |   ✓   |       |
-| Map or unmap workspace cluster agents to and from a group |       |         |          |           |            |   ✓   |       |
-
 ## Subgroup permissions
 
 When you add a member to a subgroup, they inherit the membership and
diff --git a/doc/user/project/img/description_templates_v14_7.png b/doc/user/project/img/description_templates_v14_7.png
deleted file mode 100644
index acb1b9f79d9..00000000000
Binary files a/doc/user/project/img/description_templates_v14_7.png and /dev/null differ
diff --git a/doc/user/project/img/issue_boards_multi_select_v12_4.png b/doc/user/project/img/issue_boards_multi_select_v12_4.png
deleted file mode 100644
index eebe06b04ae..00000000000
Binary files a/doc/user/project/img/issue_boards_multi_select_v12_4.png and /dev/null differ
diff --git a/doc/user/project/ml/experiment_tracking/mlflow_client.md b/doc/user/project/ml/experiment_tracking/mlflow_client.md
index 5c4b3ac0eeb..e66e0ab2426 100644
--- a/doc/user/project/ml/experiment_tracking/mlflow_client.md
+++ b/doc/user/project/ml/experiment_tracking/mlflow_client.md
@@ -340,7 +340,7 @@ from mlflow import MlflowClient
 
 client = MlflowClient()
 model_name = '<your_model_name>'
-version = '<your_version'  # e.g. '1.0.0'
+version = '<your_version'  # for example: '1.0.0'
 
 # Alternatively search the version
 version = mlflow.search_registered_models(filter_string="name='{model_name}'")[0].latest_versions[0].version
diff --git a/doc/user/project/repository/img/forking_workflow_fork_button_v13_10.png b/doc/user/project/repository/img/forking_workflow_fork_button_v13_10.png
deleted file mode 100644
index 376beb803a7..00000000000
Binary files a/doc/user/project/repository/img/forking_workflow_fork_button_v13_10.png and /dev/null differ
diff --git a/doc/user/project/repository/monorepos/_index.md b/doc/user/project/repository/monorepos/_index.md
index 57be39281c6..c5c371bce2c 100644
--- a/doc/user/project/repository/monorepos/_index.md
+++ b/doc/user/project/repository/monorepos/_index.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Managing monorepos
diff --git a/doc/user/project/repository/monorepos/observability.md b/doc/user/project/repository/monorepos/observability.md
index 480e12fde70..5f90bb8ebc0 100644
--- a/doc/user/project/repository/monorepos/observability.md
+++ b/doc/user/project/repository/monorepos/observability.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Metrics for measuring monorepo performance
diff --git a/doc/user/project/repository/monorepos/troubleshooting.md b/doc/user/project/repository/monorepos/troubleshooting.md
index 7ff7b4043e1..4cfa30d6bc2 100644
--- a/doc/user/project/repository/monorepos/troubleshooting.md
+++ b/doc/user/project/repository/monorepos/troubleshooting.md
@@ -1,5 +1,5 @@
 ---
-stage: Systems
+stage: Data Access
 group: Gitaly
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 title: Troubleshooting monorepo performance
diff --git a/doc/user/search/_index.md b/doc/user/search/_index.md
index 7c925934d69..b14318c65df 100644
--- a/doc/user/search/_index.md
+++ b/doc/user/search/_index.md
@@ -66,7 +66,6 @@ For more information, see [issue 477333](https://gitlab.com/gitlab-org/gitlab/-/
 - Restricting global search to authenticated users [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41041) in GitLab 13.4 [with a flag](../../administration/feature_flags.md) named `block_anonymous_global_searches`. Disabled by default.
 - Allowing search for unauthenticated users [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138975) in GitLab 16.7 [with a flag](../../administration/feature_flags.md) named `allow_anonymous_searches`. Enabled by default.
 - Restricting global search to authenticated users [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186727) in GitLab 17.11. Feature flag `block_anonymous_global_searches` removed.
-- Allowing search for unauthenticated users [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/190090) in GitLab 18.0. Feature flag `allow_anonymous_searches` removed.
 
 {{< /history >}}
 
@@ -78,15 +77,9 @@ By default, requests to `/search` and global search are available for unauthenti
 
 To restrict `/search` to authenticated users only, do one of the following:
 
-- [Restrict visibility levels](../../administration/settings/visibility_and_access_controls.md#restrict-visibility-levels)
-  for the project or group.
-- Restrict access in the **Admin** area:
-
-  1. On the left sidebar, at the bottom, select **Admin**.
-  1. Select **Settings > Search**.
-  1. Expand **Advanced search**.
-  1. Clear the **Allow unauthenticated users to use search** checkbox.
-  1. Select **Save changes**.
+- [Restrict public visibility](../../administration/settings/visibility_and_access_controls.md#restrict-visibility-levels)
+  of the project or group.
+- Disable the [feature flag](../../administration/feature_flags.md) `allow_anonymous_searches`.
 
 To restrict global search to authenticated users only:
 
diff --git a/lib/gitlab/event_store.rb b/lib/gitlab/event_store.rb
index 75070c56a06..2af8fbce629 100644
--- a/lib/gitlab/event_store.rb
+++ b/lib/gitlab/event_store.rb
@@ -44,6 +44,8 @@ module Gitlab
         store.subscribe ::Namespaces::UpdateRootStatisticsWorker, to: ::Projects::ProjectDeletedEvent
         store.subscribe ::Ci::Runners::UpdateProjectRunnersOwnerWorker, to: ::Projects::ProjectDeletedEvent
 
+        store.subscribe ::MergeRequests::ProcessAutoMergeFromEventWorker,
+          to: ::MergeRequests::AutoMerge::TitleDescriptionUpdateEvent
         store.subscribe ::MergeRequests::ProcessAutoMergeFromEventWorker, to: ::MergeRequests::DraftStateChangeEvent
         store.subscribe ::MergeRequests::ProcessAutoMergeFromEventWorker, to: ::MergeRequests::DiscussionsResolvedEvent
         store.subscribe ::MergeRequests::ProcessAutoMergeFromEventWorker, to: ::MergeRequests::MergeableEvent
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 731da15cc6f..f155943bacf 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2947,9 +2947,15 @@ msgstr ""
 msgid "AccessDropdown|Users"
 msgstr ""
 
+msgid "AccessTokens|Access token expiration"
+msgstr ""
+
 msgid "AccessTokens|Access token limit reached"
 msgstr ""
 
+msgid "AccessTokens|Access token prefix"
+msgstr ""
+
 msgid "AccessTokens|Access tokens"
 msgstr ""
 
@@ -3025,6 +3031,12 @@ msgstr ""
 msgid "AccessTokens|Description"
 msgstr ""
 
+msgid "AccessTokens|Disable access tokens"
+msgstr ""
+
+msgid "AccessTokens|Disable personal, group, project and impersonation tokens. Does not affect personal access tokens for service accounts."
+msgstr ""
+
 msgid "AccessTokens|Enable DPoP"
 msgstr ""
 
@@ -3079,6 +3091,9 @@ msgstr ""
 msgid "AccessTokens|Forces new personal access tokens for service accounts to require an expiration date. Does not affect existing token expiration dates. %{link_start}How does this affect expiration dates?%{link_end}"
 msgstr ""
 
+msgid "AccessTokens|Forces new personal, group, project and impersonation tokens to require an expiration date. Does not affect existing token expiration dates or personal access tokens for service accounts. This setting overrides the group-level %{link_start}service account token expiration%{link_end} setting."
+msgstr ""
+
 msgid "AccessTokens|Grant access to download Service Ping payload via API when authenticated as an admin user."
 msgstr ""
 
@@ -3132,6 +3147,9 @@ msgstr ""
 msgid "AccessTokens|Incoming email token"
 msgstr ""
 
+msgid "AccessTokens|Instance token prefix"
+msgstr ""
+
 msgid "AccessTokens|It cannot be used to access any other data."
 msgstr ""
 
@@ -3165,10 +3183,10 @@ msgstr ""
 msgid "AccessTokens|Not eligible to rotate token with access level higher than the user"
 msgstr ""
 
-msgid "AccessTokens|Personal / project / group access token expiration"
+msgid "AccessTokens|Personal access tokens"
 msgstr ""
 
-msgid "AccessTokens|Personal access tokens"
+msgid "AccessTokens|Require expiration date for service accounts"
 msgstr ""
 
 msgid "AccessTokens|Require expiration dates for service accounts"
@@ -3264,9 +3282,6 @@ msgstr ""
 msgid "AccessTokens|View token usage information"
 msgstr ""
 
-msgid "AccessTokens|When enabled, a user will be required to enter in an expiration date when creating an access token. Changes will not affect existing token expiration dates. This setting overrides the group-level %{link_start}service account token expiration%{link_end} setting."
-msgstr ""
-
 msgid "AccessTokens|You can also use personal access tokens to authenticate against Git over HTTP."
 msgstr ""
 
@@ -6546,9 +6561,6 @@ msgstr ""
 msgid "Allow top-level group owners to create Service accounts."
 msgstr ""
 
-msgid "Allow unauthenticated users to use search"
-msgstr ""
-
 msgid "Allow use of licensed EE features"
 msgstr ""
 
@@ -12439,9 +12451,6 @@ msgstr ""
 msgid "Changes to the title have not been saved"
 msgstr ""
 
-msgid "Changes will not affect existing token expiration dates. %{link_start}How will this affect expiration dates?%{link_end}"
-msgstr ""
-
 msgid "Changes:"
 msgstr ""
 
@@ -17059,7 +17068,7 @@ msgstr ""
 msgid "ContainerRegistry|Build an image"
 msgstr ""
 
-msgid "ContainerRegistry|CLI Commands"
+msgid "ContainerRegistry|CLI commands"
 msgstr ""
 
 msgid "ContainerRegistry|Cleanup disabled"
@@ -17110,12 +17119,6 @@ msgstr ""
 msgid "ContainerRegistry|Configure in settings"
 msgstr ""
 
-msgid "ContainerRegistry|Container Scanning for Registry: Off"
-msgstr ""
-
-msgid "ContainerRegistry|Container Scanning for Registry: On"
-msgstr ""
-
 msgid "ContainerRegistry|Container image tags can be created, overwritten, or deleted by specific user roles."
 msgstr ""
 
@@ -17137,6 +17140,12 @@ msgstr ""
 msgid "ContainerRegistry|Container registry cleanup policies"
 msgstr ""
 
+msgid "ContainerRegistry|Container scanning for registry: Off"
+msgstr ""
+
+msgid "ContainerRegistry|Container scanning for registry: On"
+msgstr ""
+
 msgid "ContainerRegistry|Continuous container scanning runs in the registry when any image or database is updated."
 msgstr ""
 
@@ -22646,9 +22655,6 @@ msgstr ""
 msgid "Disable password authentication for users with an SSO identity"
 msgstr ""
 
-msgid "Disable personal access tokens"
-msgstr ""
-
 msgid "Disable two-factor authentication"
 msgstr ""
 
@@ -32598,9 +32604,6 @@ msgstr ""
 msgid "Instance runners help link"
 msgstr ""
 
-msgid "Instance token prefix"
-msgstr ""
-
 msgid "Insufficient permission to modify user organizations"
 msgstr ""
 
@@ -44202,12 +44205,6 @@ msgstr ""
 msgid "Personal access token is required."
 msgstr ""
 
-msgid "Personal access token prefix"
-msgstr ""
-
-msgid "Personal access tokens"
-msgstr ""
-
 msgid "Personal namespaces"
 msgstr ""
 
@@ -56733,9 +56730,6 @@ msgstr ""
 msgid "Service account generated successfully"
 msgstr ""
 
-msgid "Service account token expiration"
-msgstr ""
-
 msgid "Service account was successfully updated."
 msgstr ""
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
index a04c6b885bd..5e1eda49f7f 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
@@ -11,7 +11,11 @@ module QA
 
       it(
         'filters comments and activities in an issue', :aggregate_failures,
-        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347948'
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347948',
+        quarantine: {
+          issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/534698',
+          type: :flaky
+        }
       ) do
         work_item_enabled = Page::Project::Issue::Show.perform(&:work_item_enabled?)
         page_type = work_item_enabled ? Page::Project::WorkItem::Show : Page::Project::Issue::Show
diff --git a/spec/controllers/graphql_controller_spec.rb b/spec/controllers/graphql_controller_spec.rb
index 7cbcf4f4943..909212998d9 100644
--- a/spec/controllers/graphql_controller_spec.rb
+++ b/spec/controllers/graphql_controller_spec.rb
@@ -257,6 +257,17 @@ RSpec.describe GraphqlController, feature_category: :integrations do
         post :execute
       end
 
+      context 'when query is not a string type' do
+        it 'returns an unsupported type error' do
+          post :execute, as: :json, params: { query: true }
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to include(
+            'errors' => include(a_hash_including('message' => /Expected one of/))
+          )
+        end
+      end
+
       context 'if using the GitLab CLI' do
         it 'call trackable for the old UserAgent' do
           agent = 'GLab - GitLab CLI'
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 9fbc9fba743..713c18f2639 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -252,9 +252,9 @@ RSpec.describe SearchController, feature_category: :global_search do
           end
         end
 
-        context 'when anonymous_searches_allowed is disabled' do
+        context 'when allow_anonymous_searches is disabled' do
           before do
-            stub_application_setting(anonymous_searches_allowed: false)
+            stub_feature_flags(allow_anonymous_searches: false)
           end
 
           context 'for unauthenticated user' do
@@ -754,7 +754,7 @@ RSpec.describe SearchController, feature_category: :global_search do
     describe 'redirecting' do
       using RSpec::Parameterized::TableSyntax
 
-      where(:restricted_visibility_levels, :anonymous_searches_allowed, :block_anonymous_global_searches, :redirect) do
+      where(:restricted_visibility_levels, :allow_anonymous_searches, :block_anonymous_global_searches, :redirect) do
         [Gitlab::VisibilityLevel::PUBLIC]   | true  | false | true
         [Gitlab::VisibilityLevel::PRIVATE]  | true  | false | false
         nil                                 | true  | false | false
@@ -766,7 +766,7 @@ RSpec.describe SearchController, feature_category: :global_search do
       with_them do
         before do
           stub_application_setting(restricted_visibility_levels: restricted_visibility_levels)
-          stub_application_setting(anonymous_searches_allowed: anonymous_searches_allowed)
+          stub_feature_flags(allow_anonymous_searches: allow_anonymous_searches)
           stub_application_setting(global_search_block_anonymous_searches_enabled: block_anonymous_global_searches)
         end
 
diff --git a/spec/docs_screenshots/container_registry_docs.rb b/spec/docs_screenshots/container_registry_docs.rb
index 7e533bdf1d7..49121c9b970 100644
--- a/spec/docs_screenshots/container_registry_docs.rb
+++ b/spec/docs_screenshots/container_registry_docs.rb
@@ -51,7 +51,7 @@ RSpec.describe 'Container Registry', :js do
       it 'user/packages/container_registry/img/project_image_repositories_list_with_commands_open' do
         visit_project_container_registry
 
-        click_on 'CLI Commands'
+        click_on 'CLI commands'
       end
     end
   end
diff --git a/spec/features/projects/container_registry_spec.rb b/spec/features/projects/container_registry_spec.rb
index f3315ef8f17..e40807ad6ed 100644
--- a/spec/features/projects/container_registry_spec.rb
+++ b/spec/features/projects/container_registry_spec.rb
@@ -82,7 +82,7 @@ RSpec.describe 'Container Registry', :js, feature_category: :container_registry
       it 'list page has cli commands' do
         visit_container_registry
 
-        expect(page).to have_content _('CLI Commands')
+        expect(page).to have_content _('CLI commands')
       end
     end
 
diff --git a/spec/features/user_settings/personal_access_tokens_spec.rb b/spec/features/user_settings/personal_access_tokens_spec.rb
index 14e278e3c86..66f277c0cc1 100644
--- a/spec/features/user_settings/personal_access_tokens_spec.rb
+++ b/spec/features/user_settings/personal_access_tokens_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe 'User Settings > Personal access tokens', :with_current_organizat
   end
 
   before do
+    stub_feature_flags(migrate_user_access_tokens_ui: false)
     sign_in(user)
   end
 
diff --git a/spec/frontend/admin/users/mock_data.js b/spec/frontend/admin/users/mock_data.js
index b792a5239d4..824ea9e0bb4 100644
--- a/spec/frontend/admin/users/mock_data.js
+++ b/spec/frontend/admin/users/mock_data.js
@@ -112,16 +112,10 @@ export const expectedAccessLevelToken = {
   token: GlFilteredSearchToken,
   operators: OPERATORS_IS,
   unique: true,
-  options: IS_EE
-    ? [
-        { value: 'admins', title: 'Administrator' },
-        { value: 'auditors', title: 'Auditor' },
-        { value: 'external', title: 'External' },
-      ]
-    : [
-        { value: 'admins', title: 'Administrator' },
-        { value: 'external', title: 'External' },
-      ],
+  options: [
+    { value: 'admins', title: 'Administrator' },
+    { value: 'external', title: 'External' },
+  ],
 };
 
 export const expectedTokens = [
diff --git a/spec/frontend/ci/common/private/jobs_filtered_search/app_spec.js b/spec/frontend/ci/common/private/jobs_filtered_search/app_spec.js
index 65e9084ef28..594df4a653e 100644
--- a/spec/frontend/ci/common/private/jobs_filtered_search/app_spec.js
+++ b/spec/frontend/ci/common/private/jobs_filtered_search/app_spec.js
@@ -34,7 +34,6 @@ describe('Jobs filtered search', () => {
         glFeatures: {
           adminJobsFilterRunnerType: true,
           feSearchBuildByName: true,
-          populateAndUseBuildSourceTable: true,
         },
         ...provideOptions,
       },
@@ -137,32 +136,6 @@ describe('Jobs filtered search', () => {
     });
   });
 
-  describe('when feature flag `populateAndUseBuildSourceTable` is disabled', () => {
-    const provideOptions = { glFeatures: { populateAndUseBuildSourceTable: false } };
-
-    it('does not display token for job source', () => {
-      createComponent(null, provideOptions);
-
-      expect(findJobSourceToken()).toBeUndefined();
-    });
-
-    describe('with query string passed', () => {
-      it('filtered search returns only data shape for search token `status` and not for search token `job source`', () => {
-        const tokenStatusesValue = 'SUCCESS';
-        const tokenJobSourceValue = 'PUSH';
-
-        createComponent(
-          { queryString: { statuses: tokenStatusesValue, sources: tokenJobSourceValue } },
-          provideOptions,
-        );
-
-        expect(findFilteredSearch().props('value')).toEqual([
-          { type: TOKEN_TYPE_STATUS, value: { data: tokenStatusesValue, operator: '=' } },
-        ]);
-      });
-    });
-  });
-
   describe('when feature flag `adminJobsFilterRunnerType` is disabled', () => {
     const provideOptions = { glFeatures: { adminJobsFilterRunnerType: false } };
 
diff --git a/spec/frontend/ci/jobs_page/job_page_app_spec.js b/spec/frontend/ci/jobs_page/job_page_app_spec.js
index 46c51bb2dee..b2379721888 100644
--- a/spec/frontend/ci/jobs_page/job_page_app_spec.js
+++ b/spec/frontend/ci/jobs_page/job_page_app_spec.js
@@ -63,14 +63,12 @@ describe('Job table app', () => {
     countHandler = countSuccessHandler,
     mountFn = shallowMount,
     feSearchBuildByName = false,
-    populateAndUseBuildSourceTable = false,
   } = {}) => {
     wrapper = mountFn(JobsTableApp, {
       provide: {
         fullPath: projectPath,
         glFeatures: {
           feSearchBuildByName,
-          populateAndUseBuildSourceTable,
         },
       },
       apolloProvider: createMockApolloProvider(handler, countHandler),
@@ -291,21 +289,24 @@ describe('Job table app', () => {
 
       jest.spyOn(urlUtils, 'updateHistory');
 
-      findFilteredSearch().vm.$emit('filterJobsBySearch', [mockFailedSearchToken]);
+      findFilteredSearch().vm.$emit('filterJobsBySearch', [
+        mockFailedSearchToken,
+        mockPushSourceToken,
+      ]);
 
       expect(successHandler).toHaveBeenCalledWith({
         fullPath: 'gitlab-org/gitlab',
         statuses: 'FAILED',
-        sources: null,
+        sources: mockJobSource,
         ...DEFAULT_PAGINATION,
       });
       expect(countSuccessHandler).toHaveBeenCalledWith({
         fullPath: 'gitlab-org/gitlab',
         statuses: 'FAILED',
-        sources: null,
+        sources: mockJobSource,
       });
       expect(urlUtils.updateHistory).toHaveBeenCalledWith({
-        url: `${TEST_HOST}/?statuses=FAILED`,
+        url: `${TEST_HOST}/?statuses=FAILED&sources=${mockJobSource}`,
       });
 
       findFilteredSearch().vm.$emit('filterJobsBySearch', []);
@@ -327,6 +328,86 @@ describe('Job table app', () => {
       });
     });
 
+    it('filters jobs by source', async () => {
+      createComponent();
+
+      await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockPushSourceToken]);
+
+      expect(successHandler).toHaveBeenCalledWith({
+        fullPath: 'gitlab-org/gitlab',
+        sources: mockJobSource,
+        statuses: null,
+        ...DEFAULT_PAGINATION,
+      });
+      expect(countSuccessHandler).toHaveBeenCalledWith({
+        fullPath: 'gitlab-org/gitlab',
+        sources: mockJobSource,
+        statuses: null,
+      });
+    });
+
+    it('filters only by source after removing status filter', async () => {
+      createComponent();
+
+      await findFilteredSearch().vm.$emit('filterJobsBySearch', [
+        mockFailedSearchToken,
+        mockPushSourceToken,
+      ]);
+
+      expect(successHandler).toHaveBeenCalledWith({
+        fullPath: 'gitlab-org/gitlab',
+        sources: mockJobSource,
+        statuses: 'FAILED',
+        ...DEFAULT_PAGINATION,
+      });
+      expect(countSuccessHandler).toHaveBeenCalledWith({
+        fullPath: 'gitlab-org/gitlab',
+        sources: mockJobSource,
+        statuses: 'FAILED',
+      });
+
+      await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockPushSourceToken]);
+
+      expect(successHandler).toHaveBeenCalledWith({
+        fullPath: 'gitlab-org/gitlab',
+        sources: mockJobSource,
+        statuses: null,
+        ...DEFAULT_PAGINATION,
+      });
+      expect(countSuccessHandler).toHaveBeenCalledWith({
+        fullPath: 'gitlab-org/gitlab',
+        sources: mockJobSource,
+        statuses: null,
+      });
+    });
+
+    it('updates URL query string when filtering jobs by source', async () => {
+      createComponent();
+
+      jest.spyOn(urlUtils, 'updateHistory');
+
+      await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockPushSourceToken]);
+
+      expect(urlUtils.updateHistory).toHaveBeenCalledWith({
+        url: `${TEST_HOST}/?sources=${mockJobSource}`,
+      });
+    });
+
+    it('updates URL query string when filtering jobs by source and status', async () => {
+      createComponent();
+
+      jest.spyOn(urlUtils, 'updateHistory');
+
+      await findFilteredSearch().vm.$emit('filterJobsBySearch', [
+        mockFailedSearchToken,
+        mockPushSourceToken,
+      ]);
+
+      expect(urlUtils.updateHistory).toHaveBeenCalledWith({
+        url: `${TEST_HOST}/?statuses=FAILED&sources=${mockJobSource}`,
+      });
+    });
+
     describe('with feature flag feSearchBuildByName enabled', () => {
       beforeEach(() => {
         createComponent({ feSearchBuildByName: true });
@@ -339,12 +420,14 @@ describe('Job table app', () => {
           fullPath: 'gitlab-org/gitlab',
           name: mockJobName,
           statuses: null,
+          sources: null,
           ...DEFAULT_PAGINATION,
         });
         expect(countSuccessHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           name: mockJobName,
           statuses: null,
+          sources: null,
         });
       });
 
@@ -358,12 +441,14 @@ describe('Job table app', () => {
           fullPath: 'gitlab-org/gitlab',
           name: mockJobName,
           statuses: 'FAILED',
+          sources: null,
           ...DEFAULT_PAGINATION,
         });
         expect(countSuccessHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           name: mockJobName,
           statuses: 'FAILED',
+          sources: null,
         });
 
         await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockJobName]);
@@ -372,12 +457,14 @@ describe('Job table app', () => {
           fullPath: 'gitlab-org/gitlab',
           name: mockJobName,
           statuses: null,
+          sources: null,
           ...DEFAULT_PAGINATION,
         });
         expect(countSuccessHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           name: mockJobName,
           statuses: null,
+          sources: null,
         });
       });
 
@@ -412,12 +499,14 @@ describe('Job table app', () => {
         expect(successHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           statuses: 'FAILED',
+          sources: null,
           name: mockJobName,
           ...DEFAULT_PAGINATION,
         });
         expect(countSuccessHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           statuses: 'FAILED',
+          sources: null,
           name: mockJobName,
         });
         expect(urlUtils.updateHistory).toHaveBeenCalledWith({
@@ -433,136 +522,18 @@ describe('Job table app', () => {
         expect(successHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           statuses: null,
+          sources: null,
           name: null,
           ...DEFAULT_PAGINATION,
         });
         expect(countSuccessHandler).toHaveBeenCalledWith({
           fullPath: 'gitlab-org/gitlab',
           statuses: null,
+          sources: null,
           name: null,
         });
       });
     });
-
-    describe('with feature flag populateAndUseBuildSourceTable enabled', () => {
-      beforeEach(() => {
-        createComponent({ populateAndUseBuildSourceTable: true });
-      });
-
-      it('filters jobs by source', async () => {
-        await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockPushSourceToken]);
-
-        expect(successHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          sources: mockJobSource,
-          statuses: null,
-          ...DEFAULT_PAGINATION,
-        });
-        expect(countSuccessHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          sources: mockJobSource,
-          statuses: null,
-        });
-      });
-
-      it('filters only by source after removing status filter', async () => {
-        await findFilteredSearch().vm.$emit('filterJobsBySearch', [
-          mockFailedSearchToken,
-          mockPushSourceToken,
-        ]);
-
-        expect(successHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          sources: mockJobSource,
-          statuses: 'FAILED',
-          ...DEFAULT_PAGINATION,
-        });
-        expect(countSuccessHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          sources: mockJobSource,
-          statuses: 'FAILED',
-        });
-
-        await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockPushSourceToken]);
-
-        expect(successHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          sources: mockJobSource,
-          statuses: null,
-          ...DEFAULT_PAGINATION,
-        });
-        expect(countSuccessHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          sources: mockJobSource,
-          statuses: null,
-        });
-      });
-
-      it('updates URL query string when filtering jobs by source', async () => {
-        jest.spyOn(urlUtils, 'updateHistory');
-
-        await findFilteredSearch().vm.$emit('filterJobsBySearch', [mockPushSourceToken]);
-
-        expect(urlUtils.updateHistory).toHaveBeenCalledWith({
-          url: `${TEST_HOST}/?sources=${mockJobSource}`,
-        });
-      });
-
-      it('updates URL query string when filtering jobs by source and status', async () => {
-        jest.spyOn(urlUtils, 'updateHistory');
-
-        await findFilteredSearch().vm.$emit('filterJobsBySearch', [
-          mockFailedSearchToken,
-          mockPushSourceToken,
-        ]);
-
-        expect(urlUtils.updateHistory).toHaveBeenCalledWith({
-          url: `${TEST_HOST}/?statuses=FAILED&sources=${mockJobSource}`,
-        });
-      });
-
-      it('resets query param after clearing tokens', () => {
-        jest.spyOn(urlUtils, 'updateHistory');
-
-        findFilteredSearch().vm.$emit('filterJobsBySearch', [
-          mockFailedSearchToken,
-          mockPushSourceToken,
-        ]);
-
-        expect(successHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          statuses: 'FAILED',
-          sources: mockJobSource,
-          ...DEFAULT_PAGINATION,
-        });
-        expect(countSuccessHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          statuses: 'FAILED',
-          sources: mockJobSource,
-        });
-        expect(urlUtils.updateHistory).toHaveBeenCalledWith({
-          url: `${TEST_HOST}/?statuses=FAILED&sources=${mockJobSource}`,
-        });
-
-        findFilteredSearch().vm.$emit('filterJobsBySearch', []);
-
-        expect(urlUtils.updateHistory).toHaveBeenCalledWith({
-          url: `${TEST_HOST}/`,
-        });
-
-        expect(successHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          statuses: null,
-          sources: null,
-          ...DEFAULT_PAGINATION,
-        });
-        expect(countSuccessHandler).toHaveBeenCalledWith({
-          fullPath: 'gitlab-org/gitlab',
-          statuses: null,
-          sources: null,
-        });
-      });
-    });
   });
 
   describe('pagination', () => {
diff --git a/spec/frontend/groups/components/app_spec.js b/spec/frontend/groups/components/app_spec.js
index d22de1514ef..f585c30012d 100644
--- a/spec/frontend/groups/components/app_spec.js
+++ b/spec/frontend/groups/components/app_spec.js
@@ -409,29 +409,22 @@ describe('AppComponent', () => {
       });
 
       describe.each`
-        groups        | fromSearch | shouldRenderEmptyState | shouldRenderSearchEmptyState
-        ${[]}         | ${false}   | ${true}                | ${false}
-        ${mockGroups} | ${false}   | ${false}               | ${false}
-        ${[]}         | ${true}    | ${false}               | ${true}
-      `(
-        'when `groups` is $groups, and `fromSearch` is $fromSearch',
-        ({ groups, fromSearch, shouldRenderEmptyState, shouldRenderSearchEmptyState }) => {
-          it(`${shouldRenderEmptyState ? 'renders' : 'does not render'} empty state`, async () => {
-            createShallowComponent();
+        groups        | shouldRenderEmptyState
+        ${[]}         | ${true}
+        ${mockGroups} | ${false}
+      `('when `groups` is $groups', ({ groups, shouldRenderEmptyState }) => {
+        it(`${shouldRenderEmptyState ? 'renders' : 'does not render'} empty state`, async () => {
+          createShallowComponent();
 
-            await waitForPromises();
+          await waitForPromises();
 
-            vm.updateGroups(groups, fromSearch);
+          vm.updateGroups(groups);
 
-            await nextTick();
+          await nextTick();
 
-            expect(wrapper.findByTestId('empty-state').exists()).toBe(shouldRenderEmptyState);
-            expect(wrapper.findByTestId('search-empty-state').exists()).toBe(
-              shouldRenderSearchEmptyState,
-            );
-          });
-        },
-      );
+          expect(wrapper.findByTestId('empty-state').exists()).toBe(shouldRenderEmptyState);
+        });
+      });
     });
   });
 
diff --git a/spec/frontend/groups/components/empty_states/dashboard_groups_empty_state_spec.js b/spec/frontend/groups/components/empty_states/dashboard_groups_empty_state_spec.js
new file mode 100644
index 00000000000..fca2b45397e
--- /dev/null
+++ b/spec/frontend/groups/components/empty_states/dashboard_groups_empty_state_spec.js
@@ -0,0 +1,28 @@
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import DashboardGroupsEmptyState from '~/groups/components/empty_states/dashboard_groups_empty_state.vue';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
+
+jest.mock(
+  '@gitlab/svgs/dist/illustrations/empty-state/empty-groups-md.svg?url',
+  () => 'empty-groups-md.svg',
+);
+
+let wrapper;
+
+const createComponent = () => {
+  wrapper = shallowMountExtended(DashboardGroupsEmptyState);
+};
+
+describe('DashboardGroupsEmptyState', () => {
+  it('renders empty state', () => {
+    createComponent();
+
+    expect(wrapper.findComponent(ResourceListsEmptyState).props()).toMatchObject({
+      title: 'A group is a collection of several projects',
+      description:
+        "If you organize your projects under a group, it works like a folder. You can manage your group member's permissions and access to each project in the group.",
+      svgPath: 'empty-groups-md.svg',
+      search: '',
+    });
+  });
+});
diff --git a/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js b/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js
index 0b1e4c0a45d..872d65ccad9 100644
--- a/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_states/groups_explore_empty_state_spec.js
@@ -1,7 +1,6 @@
-import { GlEmptyState } from '@gitlab/ui';
-
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import GroupsExploreEmptyState from '~/groups/components/empty_states/groups_explore_empty_state.vue';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
 
 jest.mock(
   '@gitlab/svgs/dist/illustrations/empty-state/empty-groups-md.svg?url',
@@ -14,17 +13,14 @@ const createComponent = () => {
   wrapper = shallowMountExtended(GroupsExploreEmptyState);
 };
 
-afterEach(() => {
-  window.gon = {};
-});
-
 describe('GroupsExploreEmptyState', () => {
   it('renders empty state', () => {
     createComponent();
 
-    expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+    expect(wrapper.findComponent(ResourceListsEmptyState).props()).toMatchObject({
       title: 'No public or internal groups',
       svgPath: 'empty-groups-md.svg',
+      search: '',
     });
   });
 });
diff --git a/spec/frontend/groups/components/empty_states/inactive_projects_empty_state_spec.js b/spec/frontend/groups/components/empty_states/inactive_projects_empty_state_spec.js
index 102ab1f37dc..448dc8c1501 100644
--- a/spec/frontend/groups/components/empty_states/inactive_projects_empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_states/inactive_projects_empty_state_spec.js
@@ -1,7 +1,7 @@
-import { GlEmptyState } from '@gitlab/ui';
-
-import { mountExtended } from 'helpers/vue_test_utils_helper';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import InactiveProjectsEmptyState from '~/groups/components/empty_states/inactive_projects_empty_state.vue';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
+import { SEARCH_MINIMUM_LENGTH } from '~/groups/constants';
 
 let wrapper;
 
@@ -10,7 +10,7 @@ const defaultProvide = {
 };
 
 const createComponent = () => {
-  wrapper = mountExtended(InactiveProjectsEmptyState, {
+  wrapper = shallowMountExtended(InactiveProjectsEmptyState, {
     provide: defaultProvide,
   });
 };
@@ -19,9 +19,11 @@ describe('InactiveProjectsEmptyState', () => {
   it('renders empty state', () => {
     createComponent();
 
-    expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+    expect(wrapper.findComponent(ResourceListsEmptyState).props()).toMatchObject({
       title: InactiveProjectsEmptyState.i18n.title,
       svgPath: defaultProvide.emptyProjectsIllustration,
+      search: '',
+      searchMinimumLength: SEARCH_MINIMUM_LENGTH,
     });
   });
 });
diff --git a/spec/frontend/groups/components/empty_states/shared_groups_empty_state_spec.js b/spec/frontend/groups/components/empty_states/shared_groups_empty_state_spec.js
index 257ff244742..068e0123183 100644
--- a/spec/frontend/groups/components/empty_states/shared_groups_empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_states/shared_groups_empty_state_spec.js
@@ -1,6 +1,7 @@
-import { GlEmptyState } from '@gitlab/ui';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import SharedGroupsEmptyState from '~/groups/components/empty_states/shared_groups_empty_state.vue';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
+import { SEARCH_MINIMUM_LENGTH } from '~/groups/constants';
 
 jest.mock(
   '@gitlab/svgs/dist/illustrations/empty-state/empty-groups-md.svg?url',
@@ -17,9 +18,11 @@ describe('SharedGroupsEmptyState', () => {
   it('renders empty state', () => {
     createComponent();
 
-    expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+    expect(wrapper.findComponent(ResourceListsEmptyState).props()).toMatchObject({
       title: 'This group has not been invited to any other groups.',
       svgPath: 'empty-groups-md.svg',
+      search: '',
+      searchMinimumLength: SEARCH_MINIMUM_LENGTH,
     });
     expect(wrapper.text()).toContain(
       'Other groups this group has been invited to will appear here.',
diff --git a/spec/frontend/groups/components/empty_states/shared_projects_empty_state_spec.js b/spec/frontend/groups/components/empty_states/shared_projects_empty_state_spec.js
index ba8dc23405e..c6e0dc00061 100644
--- a/spec/frontend/groups/components/empty_states/shared_projects_empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_states/shared_projects_empty_state_spec.js
@@ -1,7 +1,7 @@
-import { GlEmptyState } from '@gitlab/ui';
-
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import SharedProjectsEmptyState from '~/groups/components/empty_states/shared_projects_empty_state.vue';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
+import { SEARCH_MINIMUM_LENGTH } from '~/groups/constants';
 
 let wrapper;
 
@@ -19,9 +19,11 @@ describe('SharedProjectsEmptyState', () => {
   it('renders empty state', () => {
     createComponent();
 
-    expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+    expect(wrapper.findComponent(ResourceListsEmptyState).props()).toMatchObject({
       title: 'This group has not been invited to any other projects.',
       svgPath: defaultProvide.emptyProjectsIllustration,
+      search: '',
+      searchMinimumLength: SEARCH_MINIMUM_LENGTH,
     });
     expect(wrapper.text()).toContain('Projects this group has been invited to will appear here.');
   });
diff --git a/spec/frontend/groups/components/empty_states/subgroups_and_projects_empty_state_spec.js b/spec/frontend/groups/components/empty_states/subgroups_and_projects_empty_state_spec.js
index 347ead765fe..e7cbcc808bf 100644
--- a/spec/frontend/groups/components/empty_states/subgroups_and_projects_empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_states/subgroups_and_projects_empty_state_spec.js
@@ -1,7 +1,7 @@
-import { GlEmptyState } from '@gitlab/ui';
-
 import { mountExtended } from 'jest/__helpers__/vue_test_utils_helper';
 import SubgroupsAndProjectsEmptyState from '~/groups/components/empty_states/subgroups_and_projects_empty_state.vue';
+import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
+import { SEARCH_MINIMUM_LENGTH } from '~/groups/constants';
 
 let wrapper;
 
@@ -58,11 +58,13 @@ describe('SubgroupsAndProjectsEmptyState', () => {
     it('renders empty state', () => {
       createComponent({ provide: { canCreateSubgroups: false, canCreateProjects: false } });
 
-      expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+      expect(wrapper.findComponent(ResourceListsEmptyState).props()).toMatchObject({
         title: 'There are no subgroups or projects in this group',
         description:
           'You do not have necessary permissions to create a subgroup or project in this group. Please contact an owner of this group to create a new subgroup or project.',
         svgPath: defaultProvide.emptySubgroupIllustration,
+        search: '',
+        searchMinimumLength: SEARCH_MINIMUM_LENGTH,
       });
 
       expect(wrapper.findByTestId('empty-subgroup-and-projects-actions').exists()).toBe(false);
diff --git a/spec/frontend/groups/components/overview_tabs_spec.js b/spec/frontend/groups/components/overview_tabs_spec.js
index c7ef673e571..30de088d0e9 100644
--- a/spec/frontend/groups/components/overview_tabs_spec.js
+++ b/spec/frontend/groups/components/overview_tabs_spec.js
@@ -332,25 +332,6 @@ describe('OverviewTabs', () => {
         sharedAssertions({ searchTerm, sort: defaultProvide.initialSort });
       });
 
-      describe('when search is less than 3 characters', () => {
-        const searchTerm = 'Fo';
-
-        beforeEach(async () => {
-          await setup();
-          emitFilter(searchTerm);
-        });
-
-        it('does not emit `fetchFilteredAndSortedGroups` event from `eventHub`', () => {
-          expect(eventHub.$emit).not.toHaveBeenCalledWith(
-            `${ACTIVE_TAB_SUBGROUPS_AND_PROJECTS}fetchFilteredAndSortedGroups`,
-            {
-              filterGroupsBy: searchTerm,
-              sortBy: defaultProvide.initialSort,
-            },
-          );
-        });
-      });
-
       describe('when search is the same', () => {
         const searchTerm = 'Foo';
 
diff --git a/spec/frontend/packages_and_registries/container_registry/explorer/components/delete_button_spec.js b/spec/frontend/packages_and_registries/container_registry/explorer/components/delete_button_spec.js
index 8ba7e40d728..ce5bdb0bf34 100644
--- a/spec/frontend/packages_and_registries/container_registry/explorer/components/delete_button_spec.js
+++ b/spec/frontend/packages_and_registries/container_registry/explorer/components/delete_button_spec.js
@@ -63,9 +63,9 @@ describe('delete_button', () => {
         'aria-label': 'Foo title',
         icon: 'remove',
         title: 'Foo title',
-        variant: 'danger',
+        variant: 'default',
         disabled: 'true',
-        category: 'secondary',
+        category: 'tertiary',
       });
     });
 
diff --git a/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/project_empty_state_spec.js b/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/project_empty_state_spec.js
index fccc16b4f04..6dff66394dd 100644
--- a/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/project_empty_state_spec.js
+++ b/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/project_empty_state_spec.js
@@ -55,7 +55,7 @@ describe('Registry Project Empty state', () => {
     });
 
     it('renders the quick start section', () => {
-      expect(wrapper.find('h5').text()).toBe('CLI Commands');
+      expect(wrapper.find('h5').text()).toBe('CLI commands');
     });
   });
 
diff --git a/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
index 1f7feda78a5..4fffabdf414 100644
--- a/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
@@ -6,7 +6,7 @@ exports[`packages_list_row renders 1`] = `
   data-testid="package-row"
 >
   <div
-    class="gl-flex gl-items-center gl-py-3"
+    class="gl-flex gl-py-3"
   >
     <div
       class="gl-flex gl-flex-col gl-grow gl-items-stretch gl-justify-between sm:gl-flex-row"
@@ -15,7 +15,7 @@ exports[`packages_list_row renders 1`] = `
         class="gl-flex gl-flex-col gl-grow gl-mb-3 gl-min-w-0 sm:gl-mb-0"
       >
         <div
-          class="gl-flex gl-font-semibold gl-items-center gl-min-h-6 gl-min-w-0 gl-text-default"
+          class="gl-font-semibold gl-items-center gl-min-h-6 gl-min-w-0 gl-text-default sm:gl-flex"
         >
           <div
             class="gl-flex gl-items-center gl-min-w-0 gl-mr-3"
@@ -73,7 +73,7 @@ exports[`packages_list_row renders 1`] = `
       </div>
     </div>
     <div
-      class="gl-flex gl-justify-end gl-pr-1 gl-w-9"
+      class="gl-items-center gl-pl-3 sm:gl-flex"
     >
       <gl-button-stub
         aria-label="Remove package"
diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
index 5c3bf8efedd..567d2c2e003 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
@@ -6,10 +6,10 @@ exports[`packages_list_row renders 1`] = `
   data-testid="package-row"
 >
   <div
-    class="gl-flex gl-items-center gl-py-3"
+    class="gl-flex gl-py-3"
   >
     <div
-      class="gl-flex gl-justify-start gl-pl-2 gl-w-7"
+      class="gl-flex gl-justify-start gl-pt-2 gl-w-7"
     >
       <gl-form-checkbox-stub
         class="gl-m-0"
@@ -23,7 +23,7 @@ exports[`packages_list_row renders 1`] = `
         class="gl-flex gl-flex-col gl-grow gl-mb-3 gl-min-w-0 sm:gl-mb-0"
       >
         <div
-          class="gl-flex gl-font-semibold gl-items-center gl-min-h-6 gl-min-w-0 gl-text-default"
+          class="gl-font-semibold gl-items-center gl-min-h-6 gl-min-w-0 gl-text-default sm:gl-flex"
         >
           <div
             class="gl-flex gl-gap-3 gl-items-center gl-min-w-0 gl-mr-5"
@@ -84,7 +84,7 @@ exports[`packages_list_row renders 1`] = `
       </div>
     </div>
     <div
-      class="gl-flex gl-justify-end gl-pr-1 gl-w-9"
+      class="gl-items-center gl-pl-3 sm:gl-flex"
     >
       <gl-disclosure-dropdown-stub
         autoclose="true"
diff --git a/spec/frontend/vue_shared/components/registry/list_item_spec.js b/spec/frontend/vue_shared/components/registry/list_item_spec.js
index c23a7bb10f8..8e30166d1f5 100644
--- a/spec/frontend/vue_shared/components/registry/list_item_spec.js
+++ b/spec/frontend/vue_shared/components/registry/list_item_spec.js
@@ -10,7 +10,6 @@ describe('list item', () => {
   const findLeftActionSlot = () => wrapper.findByTestId('left-action');
   const findLeftPrimarySlot = () => wrapper.findByTestId('left-primary');
   const findLeftSecondarySlot = () => wrapper.findByTestId('left-secondary');
-  const findLeftAfterToggleSlot = () => wrapper.findByTestId('left-after-toggle');
   const findRightPrimarySlot = () => wrapper.findByTestId('right-primary');
   const findRightSecondarySlot = () => wrapper.findByTestId('right-secondary');
   const findRightActionSlot = () => wrapper.findByTestId('right-action');
@@ -24,7 +23,6 @@ describe('list item', () => {
         'left-action': '<div data-testid="left-action" />',
         'left-primary': '<div data-testid="left-primary" />',
         'left-secondary': '<div data-testid="left-secondary" />',
-        'left-after-toggle': '<div data-testid="left-after-toggle" />',
         'right-primary': '<div data-testid="right-primary" />',
         'right-secondary': '<div data-testid="right-secondary" />',
         'right-action': '<div data-testid="right-action" />',
@@ -37,14 +35,13 @@ describe('list item', () => {
   };
 
   describe.each`
-    slotName               | finderFunction
-    ${'left-primary'}      | ${findLeftPrimarySlot}
-    ${'left-secondary'}    | ${findLeftSecondarySlot}
-    ${'left-after-toggle'} | ${findLeftAfterToggleSlot}
-    ${'right-primary'}     | ${findRightPrimarySlot}
-    ${'right-secondary'}   | ${findRightSecondarySlot}
-    ${'left-action'}       | ${findLeftActionSlot}
-    ${'right-action'}      | ${findRightActionSlot}
+    slotName             | finderFunction
+    ${'left-primary'}    | ${findLeftPrimarySlot}
+    ${'left-secondary'}  | ${findLeftSecondarySlot}
+    ${'right-primary'}   | ${findRightPrimarySlot}
+    ${'right-secondary'} | ${findRightSecondarySlot}
+    ${'left-action'}     | ${findLeftActionSlot}
+    ${'right-action'}    | ${findRightActionSlot}
   `('$slotName slot', ({ finderFunction, slotName }) => {
     it('exist when the slot is filled', () => {
       mountComponent();
diff --git a/spec/frontend/work_items/components/create_work_item_spec.js b/spec/frontend/work_items/components/create_work_item_spec.js
index 4a810e6deb3..9414e12d682 100644
--- a/spec/frontend/work_items/components/create_work_item_spec.js
+++ b/spec/frontend/work_items/components/create_work_item_spec.js
@@ -3,6 +3,7 @@ import VueApollo from 'vue-apollo';
 import { GlAlert, GlButton, GlFormSelect, GlLink, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import namespaceWorkItemTypesQueryResponse from 'test_fixtures/graphql/work_items/project_namespace_work_item_types.query.graphql.json';
+import { setHTMLFixture } from 'helpers/fixtures';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -45,17 +46,6 @@ jest.mock('~/work_items/graphql/cache_utils', () => ({
   setNewWorkItemCache: jest.fn(),
 }));
 
-jest.mock('~/lib/utils/url_utility', () => ({
-  getParameterByName: jest.fn().mockReturnValue('13'),
-  mergeUrlParams: jest.fn().mockReturnValue('/branches?state=all&search=%5Emain%24'),
-  joinPaths: jest.fn(),
-  setUrlParams: jest
-    .fn()
-    .mockReturnValue('/project/Project/-/settings/repository/branch_rules?branch=main'),
-  setUrlFragment: jest.fn(),
-  visitUrl: jest.fn().mockName('visitUrlMock'),
-}));
-
 Vue.use(VueApollo);
 
 describe('Create work item component', () => {
@@ -91,6 +81,10 @@ describe('Create work item component', () => {
   const findFormButtons = () => wrapper.find('[data-testid="form-buttons"]');
   const findCreateButton = () => wrapper.find('[data-testid="create-button"]');
   const findCancelButton = () => wrapper.find('[data-testid="cancel-button"]');
+  const findResolveDiscussionSection = () =>
+    wrapper.find('[data-testid="work-item-resolve-discussion"]');
+  const findResolveDiscussionLink = () =>
+    wrapper.find('[data-testid="work-item-resolve-discussion"]').findComponent(GlLink);
 
   const namespaceWorkItemTypes =
     namespaceWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes;
@@ -349,6 +343,9 @@ describe('Create work item component', () => {
 
   describe('Create work item', () => {
     it('emits workItemCreated on successful mutation', async () => {
+      setWindowLocation(
+        '?discussion_to_resolve=f20989738bfe845f73a77a7109b1588852901befJD9I3FGU&merge_request_id=13',
+      );
       const workItem = { ...createWorkItemMutationResponse.data.workItemCreate.workItem };
       // there is a mismatch between the response and the expected workItem object between CE and EE fixture
       // so we need to remove the `promotedToEpicUrl` property from the expected workItem object
@@ -620,6 +617,24 @@ describe('Create work item component', () => {
     });
   });
 
+  describe('confidentiality checkbox', () => {
+    it('is checked when parameter issue[confidential]=true', async () => {
+      setWindowLocation('?issue[confidential]=true');
+      createComponent();
+      await waitForPromises();
+
+      expect(findConfidentialCheckbox().attributes('checked')).toBe('true');
+    });
+
+    it('is not checked when parameter issue[confidential]!=true', async () => {
+      setWindowLocation('?issue[confidential]=tru');
+      createComponent();
+      await waitForPromises();
+
+      expect(findConfidentialCheckbox().attributes('checked')).toBeUndefined();
+    });
+  });
+
   describe('With related item', () => {
     const id = 'gid://gitlab/WorkItem/1';
     const type = 'Epic';
@@ -744,6 +759,44 @@ describe('Create work item component', () => {
     });
   });
 
+  describe('title and description query parameters', () => {
+    it('saves to the cache when the backend provides them', async () => {
+      setHTMLFixture(`
+        <div class="new-issue-params hidden">
+          <div class="params-title">
+            i am a title
+          </div>
+          <div class="params-description">
+            i
+            am
+            a
+            description!
+          </div>
+          <div class="params-add-related-issue">
+            234
+          </div>
+          <div class="params-discussion-to-resolve">
+
+          </div>
+        </div>`);
+      createComponent();
+      await waitForPromises();
+
+      expect(setNewWorkItemCache).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        'i am a title',
+        `i
+            am
+            a
+            description!`,
+      );
+    });
+  });
+
   describe('New work item to resolve threads', () => {
     it('when not resolving any thread, does not pass resolve params to mutation', async () => {
       createComponent({
@@ -763,28 +816,6 @@ describe('Create work item component', () => {
     });
 
     it('when resolving all threads in a merge request', async () => {
-      setWindowLocation('?merge_request_id=13');
-
-      createComponent({
-        singleWorkItemType: true,
-        preselectedWorkItemType: WORK_ITEM_TYPE_NAME_ISSUE,
-      });
-      await waitForPromises();
-
-      await updateWorkItemTitle();
-      await submitCreateForm();
-
-      expect(createWorkItemSuccessHandler).toHaveBeenCalledWith({
-        input: expect.objectContaining({
-          discussionsToResolve: {
-            discussionId: '13',
-            noteableId: 'gid://gitlab/MergeRequest/13',
-          },
-        }),
-      });
-    });
-
-    it('when resolving one thread in a merge request', async () => {
       setWindowLocation(
         '?discussion_to_resolve=13&merge_request_to_resolve_discussions_of=112&merge_request_id=13',
       );
@@ -807,5 +838,64 @@ describe('Create work item component', () => {
         }),
       });
     });
+
+    describe('when resolving one thread in a merge request', () => {
+      beforeEach(async () => {
+        setHTMLFixture(`
+        <div class="new-issue-params hidden">
+          <div class="params-title">
+            Follow-up from "Necessitatibus delectus ex animi consequatur facere ipsum quaerat iusto veniam architecto."
+          </div>
+          <div class="params-description">
+            The following discussion from !1 should be addressed:
+
+            - [ ] @marlen started a [discussion](http://127.0.0.1:3000/flightjs/Flight/-/merge_requests/1#note_1224):  (+1 comment)
+
+                &gt; Quis nihil est molestias nemo rerum aspernatur.
+          </div>
+          <div class="params-add-related-issue">
+
+          </div>
+          <div class="params-discussion-to-resolve">
+            <a href="http://127.0.0.1:3000/flightjs/Flight/-/merge_requests/1#note_1224">!1 (discussion 1224)</a>
+          </div>
+        </div>`);
+        setWindowLocation(
+          '?discussion_to_resolve=13&merge_request_to_resolve_discussions_of=112&merge_request_id=13',
+        );
+        createComponent({
+          singleWorkItemType: true,
+          preselectedWorkItemType: WORK_ITEM_TYPE_NAME_ISSUE,
+        });
+        await waitForPromises();
+      });
+
+      it('renders text', () => {
+        expect(findResolveDiscussionSection().text()).toMatchInterpolatedText(
+          'Creating this issue will resolve the thread in !1 (discussion 1224)',
+        );
+      });
+
+      it('renders "resolve the thread" information', () => {
+        expect(findResolveDiscussionLink().text()).toBe('!1 (discussion 1224)');
+        expect(findResolveDiscussionLink().props('href')).toBe(
+          'http://127.0.0.1:3000/flightjs/Flight/-/merge_requests/1#note_1224',
+        );
+      });
+
+      it('calls mutation', async () => {
+        await updateWorkItemTitle();
+        await submitCreateForm();
+
+        expect(createWorkItemSuccessHandler).toHaveBeenCalledWith({
+          input: expect.objectContaining({
+            discussionsToResolve: {
+              discussionId: '13',
+              noteableId: 'gid://gitlab/MergeRequest/13',
+            },
+          }),
+        });
+      });
+    });
   });
 });
diff --git a/spec/frontend/work_items/pages/create_work_item_spec.js b/spec/frontend/work_items/pages/create_work_item_spec.js
index dab5b362b16..7b802e5239d 100644
--- a/spec/frontend/work_items/pages/create_work_item_spec.js
+++ b/spec/frontend/work_items/pages/create_work_item_spec.js
@@ -6,6 +6,7 @@ import CreateWorkItemPage from '~/work_items/pages/create_work_item.vue';
 import CreateWorkItem from '~/work_items/components/create_work_item.vue';
 import workItemRelatedItemQuery from '~/work_items/graphql/work_item_related_item.query.graphql';
 import { visitUrl, updateHistory, removeParams } from '~/lib/utils/url_utility';
+import { setHTMLFixture } from 'helpers/fixtures';
 import waitForPromises from 'helpers/wait_for_promises';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import setWindowLocation from 'helpers/set_window_location_helper';
@@ -158,6 +159,36 @@ describe('Create work item page component', () => {
     });
   });
 
+  describe('when the add_related_issue url query param is provided to the backend', () => {
+    beforeEach(async () => {
+      setHTMLFixture(`
+          <div class="new-issue-params hidden">
+            <div class="params-title">
+              i am a title
+            </div>
+            <div class="params-description">
+              i
+              am
+              a
+              description!
+            </div>
+            <div class="params-add-related-issue">
+              234
+            </div>
+            <div class="params-discussion-to-resolve">
+
+            </div>
+          </div>`);
+      createComponent();
+      await waitForPromises();
+      await nextTick();
+    });
+
+    it('queries for the related item', () => {
+      expect(relatedItemQueryHandler).toHaveBeenCalledWith({ id: 'gid://gitlab/WorkItem/234' });
+    });
+  });
+
   describe('CreateWorkItemCancelConfirmationModal', () => {
     it('modal is rendered but not visible initially', () => {
       createComponent();
diff --git a/spec/frontend/work_items/utils_spec.js b/spec/frontend/work_items/utils_spec.js
index e44c5a02dfa..80a9542c8d2 100644
--- a/spec/frontend/work_items/utils_spec.js
+++ b/spec/frontend/work_items/utils_spec.js
@@ -36,6 +36,7 @@ import {
   canRouterNav,
   formatSelectOptionForCustomField,
   preserveDetailsState,
+  getEnumFromIssueTypeParameter,
   getParentGroupName,
   createBranchMRApiPathHelper,
 } from '~/work_items/utils';
@@ -222,6 +223,21 @@ describe('convertTypeEnumToName', () => {
   });
 });
 
+describe('getEnumFromIssueTypeParameter', () => {
+  it.each`
+    param         | enumValue
+    ${'incident'} | ${WORK_ITEM_TYPE_ENUM_INCIDENT}
+    ${'inciden'}  | ${WORK_ITEM_TYPE_ENUM_ISSUE}
+    ${'issue'}    | ${WORK_ITEM_TYPE_ENUM_ISSUE}
+    ${'asdf'}     | ${WORK_ITEM_TYPE_ENUM_ISSUE}
+    ${''}         | ${undefined}
+    ${null}       | ${undefined}
+    ${undefined}  | ${undefined}
+  `('returns %enumValue when given the param %param', ({ param, enumValue }) => {
+    expect(getEnumFromIssueTypeParameter(param)).toBe(enumValue);
+  });
+});
+
 describe('isReference', () => {
   it.each`
     referenceId                                | result
diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index 5833a674e81..28127ba7a7c 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -402,12 +402,11 @@ RSpec.describe ApplicationSettingsHelper, feature_category: :shared do
     it 'returns correctly checked checkboxes' do
       helper.gitlab_ui_form_for(application_setting, url: search_admin_application_settings_path) do |form|
         result = helper.global_search_settings_checkboxes(form)
-        expect(result[0]).to have_checked_field('Allow unauthenticated users to use search', with: 1)
-        expect(result[1]).to have_checked_field('Restrict global search to authenticated users only', with: 1)
-        expect(result[2]).to have_checked_field('Show issues in global search results', with: 1)
-        expect(result[3]).not_to have_checked_field('Show merge requests in global search results', with: 1)
-        expect(result[4]).to have_checked_field('Show snippets in global search results', with: 1)
-        expect(result[5]).not_to have_checked_field('Show users in global search results', with: 1)
+        expect(result[0]).to have_checked_field('Restrict global search to authenticated users only', with: 1)
+        expect(result[1]).to have_checked_field('Show issues in global search results', with: 1)
+        expect(result[2]).not_to have_checked_field('Show merge requests in global search results', with: 1)
+        expect(result[3]).to have_checked_field('Show snippets in global search results', with: 1)
+        expect(result[4]).not_to have_checked_field('Show users in global search results', with: 1)
       end
     end
   end
diff --git a/spec/lib/api/entities/project_job_token_scope_spec.rb b/spec/lib/api/entities/project_job_token_scope_spec.rb
index e940685129a..79870fa6293 100644
--- a/spec/lib/api/entities/project_job_token_scope_spec.rb
+++ b/spec/lib/api/entities/project_job_token_scope_spec.rb
@@ -24,14 +24,14 @@ RSpec.describe ::API::Entities::ProjectJobTokenScope, feature_category: :secrets
         Gitlab::CurrentSettings.update!(enforce_ci_inbound_job_token_scope_enabled: false)
       end
 
-      it 'includes basic fields' do
+      it 'inbound_enabled and outbound_enabled default to true' do
         expect(subject).to eq(
           inbound_enabled: true,
           outbound_enabled: true
         )
       end
 
-      it 'includes basic fields' do
+      it 'inbound_enabled can be changed at the project level' do
         project.update!(ci_inbound_job_token_scope_enabled: false)
 
         expect(subject).to eq(
@@ -46,7 +46,16 @@ RSpec.describe ::API::Entities::ProjectJobTokenScope, feature_category: :secrets
         Gitlab::CurrentSettings.update!(enforce_ci_inbound_job_token_scope_enabled: true)
       end
 
-      it 'includes basic fields' do
+      it 'inbound_enabled and outbound_enabled default to true' do
+        expect(subject).to eq(
+          inbound_enabled: true,
+          outbound_enabled: true
+        )
+      end
+
+      it 'inbound_enabled can not be changed at the project level' do
+        project.update!(ci_inbound_job_token_scope_enabled: false)
+
         expect(subject).to eq(
           inbound_enabled: true,
           outbound_enabled: true
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 20a218cd1f9..b31de408f6b 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -336,21 +336,12 @@ RSpec.describe JwtController, feature_category: :system_access do
       end
     end
 
-    shared_examples 'enforce_abilities_check_for_dependency_proxy disabled' do
-      before do
-        stub_feature_flags(enforce_abilities_check_for_dependency_proxy: false)
-      end
-
-      it_behaves_like 'with valid credentials'
-    end
-
     context 'with personal access token' do
       let(:credential_user) { nil }
       let(:credential_password) { personal_access_token.token }
 
       it_behaves_like 'with valid credentials'
       it_behaves_like 'a token that expires today'
-      it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
 
       # TODO: Cleanup code related to packages_dependency_proxy_containers_scope_check
       # https://gitlab.com/gitlab-org/gitlab/-/issues/520321
@@ -360,7 +351,6 @@ RSpec.describe JwtController, feature_category: :system_access do
         end
 
         it_behaves_like 'with valid credentials'
-        it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
       end
 
       context 'without the required scopes' do
@@ -374,10 +364,7 @@ RSpec.describe JwtController, feature_category: :system_access do
           end
 
           it_behaves_like 'returning response status', :forbidden
-          it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
         end
-
-        it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
       end
     end
 
@@ -404,7 +391,6 @@ RSpec.describe JwtController, feature_category: :system_access do
           end
 
           it_behaves_like 'with valid credentials'
-          it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
         end
 
         context 'revoked' do
@@ -422,8 +408,6 @@ RSpec.describe JwtController, feature_category: :system_access do
 
           it_behaves_like 'returning response status', :unauthorized
         end
-
-        it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
       end
 
       context 'without the required scopes' do
@@ -442,8 +426,6 @@ RSpec.describe JwtController, feature_category: :system_access do
 
           it_behaves_like 'with valid credentials'
         end
-
-        it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
       end
     end
 
@@ -470,7 +452,6 @@ RSpec.describe JwtController, feature_category: :system_access do
         end
 
         it_behaves_like 'with valid credentials'
-        it_behaves_like 'enforce_abilities_check_for_dependency_proxy disabled'
       end
     end
 
diff --git a/spec/services/auth/dependency_proxy_authentication_service_spec.rb b/spec/services/auth/dependency_proxy_authentication_service_spec.rb
index 7084da48c4e..4bd1006afc8 100644
--- a/spec/services/auth/dependency_proxy_authentication_service_spec.rb
+++ b/spec/services/auth/dependency_proxy_authentication_service_spec.rb
@@ -42,22 +42,6 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
       end
     end
 
-    shared_examples 'logs missing authentication abilities' do
-      specify do
-        expect(::Gitlab::AuthLogger).to receive(:warn).with(expected_log)
-
-        subject
-      end
-    end
-
-    shared_examples 'does not log missing authentication abilities' do
-      specify do
-        expect(::Gitlab::AuthLogger).not_to receive(:warn).with(expected_log)
-
-        subject
-      end
-    end
-
     context 'dependency proxy is not enabled' do
       before do
         stub_config(dependency_proxy: { enabled: false })
@@ -118,8 +102,6 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
       it_behaves_like 'returning a token with an encoded field', 'personal_access_token'
 
       context 'with insufficient authentication abilities' do
-        it_behaves_like 'logs missing authentication abilities'
-
         # TODO: Cleanup code related to packages_dependency_proxy_containers_scope_check
         # https://gitlab.com/gitlab-org/gitlab/-/issues/520321
         context 'with packages_dependency_proxy_containers_scope_check disabled' do
@@ -128,14 +110,6 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
           end
 
           it_behaves_like 'returning', status: 403, message: 'access forbidden'
-
-          context 'with enforce_abilities_check_for_dependency_proxy disabled' do
-            before do
-              stub_feature_flags(enforce_abilities_check_for_dependency_proxy: false)
-            end
-
-            it_behaves_like 'returning a token with an encoded field', 'personal_access_token'
-          end
         end
       end
 
@@ -145,15 +119,7 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
           context "with #{abilities}" do
             let(:authentication_abilities) { abilities }
 
-            it_behaves_like 'does not log missing authentication abilities'
-
-            context 'with enforce_abilities_check_for_dependency_proxy disabled' do
-              before do
-                stub_feature_flags(enforce_abilities_check_for_dependency_proxy: false)
-              end
-
-              it_behaves_like 'returning a token with an encoded field', 'personal_access_token'
-            end
+            it_behaves_like 'returning a token with an encoded field', 'personal_access_token'
           end
         end
       end
@@ -181,14 +147,6 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
           end
 
           it_behaves_like 'returning', status: 403, message: 'access forbidden'
-
-          context 'with enforce_abilities_check_for_dependency_proxy disabled' do
-            before do
-              stub_feature_flags(enforce_abilities_check_for_dependency_proxy: false)
-            end
-
-            it_behaves_like 'returning a token with an encoded field', 'group_access_token'
-          end
         end
       end
 
@@ -202,15 +160,6 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
             subject { service.execute(authentication_abilities: authentication_abilities) }
 
             it_behaves_like 'returning a token with an encoded field', 'group_access_token'
-            it_behaves_like 'does not log missing authentication abilities'
-
-            context 'with enforce_abilities_check_for_dependency_proxy disabled' do
-              before do
-                stub_feature_flags(enforce_abilities_check_for_dependency_proxy: false)
-              end
-
-              it_behaves_like 'returning a token with an encoded field', 'group_access_token'
-            end
 
             context 'revoked' do
               before do
@@ -240,20 +189,6 @@ RSpec.describe Auth::DependencyProxyAuthenticationService, feature_category: :vi
           end
 
           it_behaves_like 'returning a token with an encoded field', 'user_id'
-
-          context 'packages_dependency_proxy_containers_scope_check disabled' do
-            before do
-              stub_feature_flags(packages_dependency_proxy_containers_scope_check: false)
-            end
-
-            context 'with enforce_abilities_check_for_dependency_proxy disabled' do
-              before do
-                stub_feature_flags(enforce_abilities_check_for_dependency_proxy: false)
-              end
-
-              it_behaves_like 'returning a token with an encoded field', 'user_id'
-            end
-          end
         end
       end
     end