diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue
index 2bfa8932b1a..7878ab89e31 100644
--- a/app/assets/javascripts/diffs/components/tree_list.vue
+++ b/app/assets/javascripts/diffs/components/tree_list.vue
@@ -144,16 +144,28 @@ export default {
     currentDiffFileId(hash) {
       if (hash) {
         this.scrollVirtualScrollerToFileHash(hash);
+        this.openFileTree(hash);
       }
     },
   },
   methods: {
-    ...mapActions('diffs', ['toggleTreeOpen', 'goToFile', 'setRenderTreeList']),
+    ...mapActions('diffs', ['toggleTreeOpen', 'goToFile', 'setRenderTreeList', 'setTreeOpen']),
 
     scrollVirtualScrollerToFileHash(hash) {
       const index = this.treeList.findIndex((f) => f.fileHash === hash);
       if (index !== -1) {
-        this.$refs.scroller.scrollToItem(index);
+        this.$refs.scroller.scrollToItem?.(index);
+      }
+    },
+    openFileTree(hash) {
+      const file = this.flatFilteredTreeList.find((f) => f.fileHash === hash);
+
+      if (file) {
+        file.path
+          .split('/')
+          .slice(0, -1)
+          .reduce((acc, part) => [...acc, acc.length ? `${acc.at(-1)}/${part}` : part], [])
+          .forEach((path) => this.setTreeOpen({ path, opened: true }));
       }
     },
   },
diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js
index be3876f8d46..f0a2ca967cf 100644
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -665,6 +665,10 @@ export const toggleTreeOpen = ({ commit }, path) => {
   commit(types.TOGGLE_FOLDER_OPEN, path);
 };
 
+export const setTreeOpen = ({ commit }, { path, opened }) => {
+  commit(types.SET_FOLDER_OPEN, { path, opened });
+};
+
 export const setCurrentFileHash = ({ commit }, hash) => {
   commit(types.SET_CURRENT_DIFF_FILE, hash);
 };
diff --git a/app/assets/javascripts/diffs/store/mutation_types.js b/app/assets/javascripts/diffs/store/mutation_types.js
index 7b02ff49e0b..2621aeaacd6 100644
--- a/app/assets/javascripts/diffs/store/mutation_types.js
+++ b/app/assets/javascripts/diffs/store/mutation_types.js
@@ -21,6 +21,7 @@ export const SET_LINE_DISCUSSIONS_FOR_FILE = 'SET_LINE_DISCUSSIONS_FOR_FILE';
 export const TOGGLE_FILE_DISCUSSION_EXPAND = 'TOGGLE_FILE_DISCUSSION_EXPAND';
 export const REMOVE_LINE_DISCUSSIONS_FOR_FILE = 'REMOVE_LINE_DISCUSSIONS_FOR_FILE';
 export const TOGGLE_FOLDER_OPEN = 'TOGGLE_FOLDER_OPEN';
+export const SET_FOLDER_OPEN = 'SET_FOLDER_OPEN';
 export const TREE_ENTRY_DIFF_LOADING = 'TREE_ENTRY_DIFF_LOADING';
 export const SET_SHOW_TREE_LIST = 'SET_SHOW_TREE_LIST';
 export const SET_CURRENT_DIFF_FILE = 'SET_CURRENT_DIFF_FILE';
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js
index ce1c7ad2453..9f219284375 100644
--- a/app/assets/javascripts/diffs/store/mutations.js
+++ b/app/assets/javascripts/diffs/store/mutations.js
@@ -291,6 +291,9 @@ export default {
   [types.TOGGLE_FOLDER_OPEN](state, path) {
     state.treeEntries[path].opened = !state.treeEntries[path].opened;
   },
+  [types.SET_FOLDER_OPEN](state, { path, opened }) {
+    state.treeEntries[path].opened = opened;
+  },
   [types.TREE_ENTRY_DIFF_LOADING](state, { path, loading = true }) {
     state.treeEntries[path].diffLoading = loading;
   },
diff --git a/app/assets/javascripts/diffs/stores/legacy_diffs/actions.js b/app/assets/javascripts/diffs/stores/legacy_diffs/actions.js
index 36379943ae2..657e03c9a94 100644
--- a/app/assets/javascripts/diffs/stores/legacy_diffs/actions.js
+++ b/app/assets/javascripts/diffs/stores/legacy_diffs/actions.js
@@ -665,6 +665,10 @@ export function toggleTreeOpen(path) {
   this[types.TOGGLE_FOLDER_OPEN](path);
 }
 
+export function setTreeOpen({ path, opened }) {
+  this[types.SET_FOLDER_OPEN]({ path, opened });
+}
+
 export function setCurrentFileHash(hash) {
   this[types.SET_CURRENT_DIFF_FILE](hash);
 }
diff --git a/app/assets/javascripts/diffs/stores/legacy_diffs/mutations.js b/app/assets/javascripts/diffs/stores/legacy_diffs/mutations.js
index 1948a6b6bea..f3af0c55f9d 100644
--- a/app/assets/javascripts/diffs/stores/legacy_diffs/mutations.js
+++ b/app/assets/javascripts/diffs/stores/legacy_diffs/mutations.js
@@ -287,6 +287,9 @@ export default {
   [types.TOGGLE_FOLDER_OPEN](path) {
     this.treeEntries[path].opened = !this.treeEntries[path].opened;
   },
+  [types.SET_FOLDER_OPEN]({ path, opened }) {
+    this.treeEntries[path].opened = opened;
+  },
   [types.TREE_ENTRY_DIFF_LOADING]({ path, loading = true }) {
     this.treeEntries[path].diffLoading = loading;
   },
diff --git a/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue b/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue
index 84416e38afe..b4e80191672 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue
@@ -12,6 +12,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
+  inject: ['newListsEnabled'],
   props: {
     title: {
       type: String,
@@ -68,7 +69,7 @@ export default {
     is-collapsible
     :collapsed="!open"
     :toggle-aria-label="toggleButtonLabel"
-    :body-class="{ '!gl-mx-0 gl-mb-0': hasMergeRequests }"
+    :body-class="{ '!gl-mx-0 gl-mb-0': hasMergeRequests || newListsEnabled }"
   >
     <template #title>
       {{ title }}
diff --git a/db/click_house/migrate/main/20250109180239_create_siphon_projects.rb b/db/click_house/migrate/main/20250109180239_create_siphon_projects.rb
new file mode 100644
index 00000000000..e3070006939
--- /dev/null
+++ b/db/click_house/migrate/main/20250109180239_create_siphon_projects.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+class CreateSiphonProjects < ClickHouse::Migration
+  def up
+    execute <<-SQL
+      CREATE TABLE IF NOT EXISTS siphon_projects
+      (
+        id Int64,
+        name Nullable(String),
+        path Nullable(String),
+        description Nullable(String),
+        created_at Nullable(DateTime64(6, 'UTC')),
+        updated_at Nullable(DateTime64(6, 'UTC')),
+        creator_id Nullable(Int64),
+        namespace_id Int64,
+        last_activity_at Nullable(DateTime64(6, 'UTC')),
+        import_url Nullable(String),
+        visibility_level Int64 DEFAULT 0,
+        archived Boolean DEFAULT false,
+        avatar Nullable(String),
+        merge_requests_template Nullable(String),
+        star_count Int64 DEFAULT 0,
+        merge_requests_rebase_enabled Nullable(Boolean) DEFAULT false,
+        import_type Nullable(String),
+        import_source Nullable(String),
+        approvals_before_merge Int64 DEFAULT 0,
+        reset_approvals_on_push Nullable(Boolean) DEFAULT true,
+        merge_requests_ff_only_enabled Nullable(Boolean) DEFAULT false,
+        issues_template Nullable(String),
+        mirror Boolean DEFAULT false,
+        mirror_last_update_at Nullable(DateTime64(6, 'UTC')),
+        mirror_last_successful_update_at Nullable(DateTime64(6, 'UTC')),
+        mirror_user_id Nullable(Int64),
+        shared_runners_enabled Boolean DEFAULT true,
+        runners_token Nullable(String),
+        build_allow_git_fetch Boolean DEFAULT true,
+        build_timeout Int64 DEFAULT 3600,
+        mirror_trigger_builds Boolean DEFAULT false,
+        pending_delete Nullable(Boolean) DEFAULT false,
+        public_builds Boolean DEFAULT true,
+        last_repository_check_failed Nullable(Boolean),
+        last_repository_check_at Nullable(DateTime64(6, 'UTC')),
+        only_allow_merge_if_pipeline_succeeds Boolean DEFAULT false,
+        has_external_issue_tracker Nullable(Boolean),
+        repository_storage String DEFAULT 'default',
+        repository_read_only Nullable(Boolean),
+        request_access_enabled Boolean DEFAULT true,
+        has_external_wiki Nullable(Boolean),
+        ci_config_path Nullable(String),
+        lfs_enabled Nullable(Boolean),
+        description_html Nullable(String),
+        only_allow_merge_if_all_discussions_are_resolved Nullable(Boolean),
+        repository_size_limit Nullable(Int64),
+        printing_merge_request_link_enabled Boolean DEFAULT true,
+        auto_cancel_pending_pipelines Int64 DEFAULT 1,
+        service_desk_enabled Nullable(Boolean) DEFAULT true,
+        cached_markdown_version Nullable(Int64),
+        delete_error Nullable(String),
+        last_repository_updated_at Nullable(DateTime64(6, 'UTC')),
+        disable_overriding_approvers_per_merge_request Nullable(Boolean),
+        storage_version Nullable(Int8),
+        resolve_outdated_diff_discussions Nullable(Boolean),
+        remote_mirror_available_overridden Nullable(Boolean),
+        only_mirror_protected_branches Nullable(Boolean),
+        pull_mirror_available_overridden Nullable(Boolean),
+        jobs_cache_index Nullable(Int64),
+        external_authorization_classification_label Nullable(String),
+        mirror_overwrites_diverged_branches Nullable(Boolean),
+        pages_https_only Nullable(Boolean) DEFAULT true,
+        external_webhook_token Nullable(String),
+        packages_enabled Nullable(Boolean),
+        merge_requests_author_approval Nullable(Boolean) DEFAULT false,
+        pool_repository_id Nullable(Int64),
+        runners_token_encrypted Nullable(String),
+        bfg_object_map Nullable(String),
+        detected_repository_languages Nullable(Boolean),
+        merge_requests_disable_committers_approval Nullable(Boolean),
+        require_password_to_approve Nullable(Boolean),
+        emails_disabled Nullable(Boolean),
+        max_pages_size Nullable(Int64),
+        max_artifacts_size Nullable(Int64),
+        pull_mirror_branch_prefix Nullable(String),
+        remove_source_branch_after_merge Nullable(Boolean),
+        marked_for_deletion_at Nullable(Date32),
+        marked_for_deletion_by_user_id Nullable(Int64),
+        autoclose_referenced_issues Nullable(Boolean),
+        suggestion_commit_message Nullable(String),
+        project_namespace_id Nullable(Int64),
+        hidden Boolean DEFAULT false,
+        organization_id Nullable(Int64),
+        _siphon_replicated_at DateTime64(6, 'UTC') DEFAULT now(),
+        _siphon_deleted Boolean DEFAULT FALSE
+      )
+      ENGINE = ReplacingMergeTree(_siphon_replicated_at, _siphon_deleted)
+      PRIMARY KEY id
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      DROP TABLE IF EXISTS siphon_projects
+    SQL
+  end
+end
diff --git a/doc/administration/administer_users.md b/doc/administration/administer_users.md
index 9e0ba0a1639..41045e1a56f 100644
--- a/doc/administration/administer_users.md
+++ b/doc/administration/administer_users.md
@@ -11,7 +11,7 @@ DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** Self-managed
 
-Administer and manage users in your self-managed GitLab installation.
+Administer and manage users in GitLab Self-Managed.
 
 ## User accounts
 
diff --git a/doc/administration/configure.md b/doc/administration/configure.md
index 0dad805e255..cbc2ef36fb8 100644
--- a/doc/administration/configure.md
+++ b/doc/administration/configure.md
@@ -11,7 +11,7 @@ DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** Self-managed
 
-Customize and configure your self-managed GitLab installation.
+Customize and configure GitLab Self-Managed.
 
 - [Authentication](auth/index.md)
 - [CI/CD](../administration/cicd/index.md)
diff --git a/doc/administration/diff_limits.md b/doc/administration/diff_limits.md
index 5088aaa1ca9..a21227f3f33 100644
--- a/doc/administration/diff_limits.md
+++ b/doc/administration/diff_limits.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Configure the maximum diff size to display on your self-managed GitLab instance."
+description: "Configure the maximum diff size to display on GitLab Self-Managed."
 ---
 
 # Diff limits administration
diff --git a/doc/administration/docs_self_host.md b/doc/administration/docs_self_host.md
index 825431e8024..fbdeee52fef 100644
--- a/doc/administration/docs_self_host.md
+++ b/doc/administration/docs_self_host.md
@@ -17,7 +17,7 @@ NOTE:
 The local help of your instance does not include all the docs (for example, it
 doesn't include docs for GitLab Runner or GitLab Operator), and it's not
 searchable or browsable. It's intended to only support direct links to specific
-pages from within a self-managed GitLab instance.
+pages from within your instance.
 
 ## Documentation self-hosting options
 
diff --git a/doc/administration/geo/index.md b/doc/administration/geo/index.md
index a59603a3303..b00d2565233 100644
--- a/doc/administration/geo/index.md
+++ b/doc/administration/geo/index.md
@@ -81,11 +81,11 @@ Benefits:
 
 #### Migration to GitLab Dedicated
 
-You can also use Geo to migrate your self-managed GitLab instance to [GitLab Dedicated](../../subscriptions/gitlab_dedicated/index.md). A migration to GitLab Dedicated is similar to an infrastructure migration.
+You can also use Geo to migrate GitLab Self-Managed to [GitLab Dedicated](../../subscriptions/gitlab_dedicated/index.md). A migration to GitLab Dedicated is similar to an infrastructure migration.
 
 Benefits:
 
-- Smoother onboarding experience with significantly lower downtime. Your team can continue to use your self-managed GitLab instance while the data migration takes place in the background.
+- Smoother onboarding experience with significantly lower downtime. Your team can continue to use GitLab Self-Managed while the data migration takes place in the background.
 
 ## What Geo is not designed to address
 
diff --git a/doc/administration/git_protocol.md b/doc/administration/git_protocol.md
index 08a42ba40eb..939b5d8acd1 100644
--- a/doc/administration/git_protocol.md
+++ b/doc/administration/git_protocol.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Set and configure Git protocol v2 for your self-managed GitLab instance."
+description: "Set and configure Git protocol v2 for GitLab Self-Managed."
 ---
 
 # Configuring Git Protocol v2
diff --git a/doc/administration/index.md b/doc/administration/index.md
index 59894726289..7992c5c62e4 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -7,7 +7,7 @@ description: 'Learn how to install, configure, update, and maintain your GitLab
 
 # Administer GitLab
 
-Learn how to administer a self-managed GitLab instance.
+Learn how to administer GitLab Self-Managed.
 
 | | | |
 |--|--|--|
diff --git a/doc/administration/integration/diagrams_net.md b/doc/administration/integration/diagrams_net.md
index d15d2e09dc8..2ff0e804b1a 100644
--- a/doc/administration/integration/diagrams_net.md
+++ b/doc/administration/integration/diagrams_net.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Configure a Diagrams.net integration for your self-managed GitLab instance."
+description: "Configure a Diagrams.net integration for GitLab Self-Managed."
 ---
 
 # Diagrams.net
@@ -34,7 +34,7 @@ After completing the integration, the diagrams.net editor opens with the URL you
 
 You can set up your own diagrams.net server to generate the diagrams.
 
-It's a required step for users on an offline environment self-managed GitLab installations.
+It's a required step for users on an offline installation of GitLab Self-Managed.
 
 For example, to run a diagrams.net container in Docker, run the following command:
 
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index 01c560197ec..c211cdc2c74 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Configure PlantUML integration with your self-managed GitLab instance."
+description: "Configure PlantUML integration with GitLab Self-Managed."
 ---
 
 # PlantUML
diff --git a/doc/administration/lfs/index.md b/doc/administration/lfs/index.md
index 39d5b967ea5..4896a7fbce5 100644
--- a/doc/administration/lfs/index.md
+++ b/doc/administration/lfs/index.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Configure Git LFS for your self-managed GitLab instance."
+description: "Configure Git LFS for GitLab Self-Managed."
 ---
 
 # GitLab Git Large File Storage (LFS) Administration
diff --git a/doc/administration/moderate_users.md b/doc/administration/moderate_users.md
index 699f9f0e56f..47c8f55798c 100644
--- a/doc/administration/moderate_users.md
+++ b/doc/administration/moderate_users.md
@@ -166,7 +166,7 @@ Prerequisites:
 
 - The user has had no activity in the last 90 days.
 
-To deactivate a user from a self-managed GitLab instance:
+To deactivate a user:
 
 1. On the left sidebar, at the bottom, select **Admin**.
 1. Select **Overview > Users**.
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index d2ad45a4e0b..6fd6182d3d1 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -241,7 +241,7 @@ configuration option in `gitlab.yml`. These metrics are served from the
 | `sidekiq_jobs_dead_total`                      | Counter   | 13.7 | Sidekiq dead jobs (jobs that have run out of retries)                                               | `queue`, `boundary`, `external_dependencies`, `feature_category`, `urgency` |
 | `sidekiq_redis_requests_total`                 | Counter   | 13.1 | Redis requests during a Sidekiq job execution                                                       | `queue`, `boundary`, `external_dependencies`, `feature_category`, `job_status`, `urgency` |
 | `sidekiq_elasticsearch_requests_total`         | Counter   | 13.1 | Elasticsearch requests during a Sidekiq job execution                                                       | `queue`, `boundary`, `external_dependencies`, `feature_category`, `job_status`, `urgency` |
-| `sidekiq_jobs_skipped_total`                   | Counter   | 16.2 | Number of jobs being skipped (dropped or deferred) when `drop_sidekiq_jobs` feature flag is enabled or `run_sidekiq_jobs` feature flag is disabled                          | `worker`, `action`                                                                                   |
+| `sidekiq_jobs_skipped_total`                   | Counter   | 16.2 | Number of jobs being skipped (dropped or deferred) when `drop_sidekiq_jobs` feature flag is enabled or `run_sidekiq_jobs` feature flag is disabled                          | `worker`, `action`, `feature_category`, `reason`                                                                                   |
 | `sidekiq_running_jobs`                         | Gauge     | 12.2 | Number of Sidekiq jobs running                                                                      | `queue`, `boundary`, `external_dependencies`, `feature_category`, `urgency` |
 | `sidekiq_concurrency`                          | Gauge     | 12.5 | Maximum number of Sidekiq jobs                                                                      |                                                                   |
 | `sidekiq_mem_total_bytes`                      | Gauge     | 15.3 | Number of bytes allocated for both objects consuming an object slot and objects that required a malloc'|                                                                   |
diff --git a/doc/administration/monitoring/prometheus/pgbouncer_exporter.md b/doc/administration/monitoring/prometheus/pgbouncer_exporter.md
index 26f85f7173d..ba28d0fbe71 100644
--- a/doc/administration/monitoring/prometheus/pgbouncer_exporter.md
+++ b/doc/administration/monitoring/prometheus/pgbouncer_exporter.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/monitoring/prometheus/postgres_exporter.md b/doc/administration/monitoring/prometheus/postgres_exporter.md
index a10c06ff8a9..ad29b56a1d5 100644
--- a/doc/administration/monitoring/prometheus/postgres_exporter.md
+++ b/doc/administration/monitoring/prometheus/postgres_exporter.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/database_load_balancing.md b/doc/administration/postgresql/database_load_balancing.md
index 50f177c30d9..02c65f587a4 100644
--- a/doc/administration/postgresql/database_load_balancing.md
+++ b/doc/administration/postgresql/database_load_balancing.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 ---
 
diff --git a/doc/administration/postgresql/external.md b/doc/administration/postgresql/external.md
index 996147f0af5..fa3eb9d264c 100644
--- a/doc/administration/postgresql/external.md
+++ b/doc/administration/postgresql/external.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/external_metrics.md b/doc/administration/postgresql/external_metrics.md
index 8b849bc4e71..47ab00f9fd4 100644
--- a/doc/administration/postgresql/external_metrics.md
+++ b/doc/administration/postgresql/external_metrics.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/external_upgrade.md b/doc/administration/postgresql/external_upgrade.md
index 97e1c5e2cb9..dc37b83575f 100644
--- a/doc/administration/postgresql/external_upgrade.md
+++ b/doc/administration/postgresql/external_upgrade.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/index.md b/doc/administration/postgresql/index.md
index ad2949c803c..e81e2507ee7 100644
--- a/doc/administration/postgresql/index.md
+++ b/doc/administration/postgresql/index.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/moving.md b/doc/administration/postgresql/moving.md
index c75168c06a0..d24a4421a73 100644
--- a/doc/administration/postgresql/moving.md
+++ b/doc/administration/postgresql/moving.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/pgbouncer.md b/doc/administration/postgresql/pgbouncer.md
index 2fab7b6e7fd..8b18710db9b 100644
--- a/doc/administration/postgresql/pgbouncer.md
+++ b/doc/administration/postgresql/pgbouncer.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md
index 3aee3d8864e..2546bc68479 100644
--- a/doc/administration/postgresql/replication_and_failover.md
+++ b/doc/administration/postgresql/replication_and_failover.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/replication_and_failover_troubleshooting.md b/doc/administration/postgresql/replication_and_failover_troubleshooting.md
index e63547c4fd2..86ae6e1e664 100644
--- a/doc/administration/postgresql/replication_and_failover_troubleshooting.md
+++ b/doc/administration/postgresql/replication_and_failover_troubleshooting.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/standalone.md b/doc/administration/postgresql/standalone.md
index 9789fa852dc..30531730ab9 100644
--- a/doc/administration/postgresql/standalone.md
+++ b/doc/administration/postgresql/standalone.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/postgresql/upgrading_os.md b/doc/administration/postgresql/upgrading_os.md
index 7de6ad0c09f..e6542866e58 100644
--- a/doc/administration/postgresql/upgrading_os.md
+++ b/doc/administration/postgresql/upgrading_os.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/self_hosted_models/index.md b/doc/administration/self_hosted_models/index.md
index 3f17dad495d..79b939241e4 100644
--- a/doc/administration/self_hosted_models/index.md
+++ b/doc/administration/self_hosted_models/index.md
@@ -70,7 +70,7 @@ If you do not meet the use case criteria for self-hosted models, you can use the
 GitLab.com AI gateway with default GitLab external vendor LLMs.
 
 The GitLab.com AI gateway is the default Enterprise offering and is not self-hosted. In this configuration,
-you connect your self-managed GitLab instance to the GitLab-hosted AI gateway, which
+you connect your GitLab Self-Managed instance to the GitLab-hosted AI gateway, which
 integrates with external vendor LLM providers (such as Google Vertex or Anthropic).
 
 These LLMs communicate through the [GitLab Cloud Connector](../../development/cloud_connector/index.md),
diff --git a/doc/administration/settings/account_and_limit_settings.md b/doc/administration/settings/account_and_limit_settings.md
index bfbd493e13c..fc133a28177 100644
--- a/doc/administration/settings/account_and_limit_settings.md
+++ b/doc/administration/settings/account_and_limit_settings.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Configure the maximum number of projects users can create on your self-managed GitLab instance. Configure size limits for attachments, pushes, and repository size."
+description: "Configure the maximum number of projects users can create on GitLab Self-Managed. Configure size limits for attachments, pushes, and repository size."
 ---
 
 # Account and limit settings
diff --git a/doc/administration/settings/deprecated_api_rate_limits.md b/doc/administration/settings/deprecated_api_rate_limits.md
index d05c933178a..6ebaf6b350b 100644
--- a/doc/administration/settings/deprecated_api_rate_limits.md
+++ b/doc/administration/settings/deprecated_api_rate_limits.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Define limits for deprecated APIs on your self-managed GitLab instance."
+description: "Define limits for deprecated APIs on GitLab Self-Managed."
 ---
 
 # Deprecated API rate limits
diff --git a/doc/administration/settings/files_api_rate_limits.md b/doc/administration/settings/files_api_rate_limits.md
index 9e7a589fed4..8c1d191ed06 100644
--- a/doc/administration/settings/files_api_rate_limits.md
+++ b/doc/administration/settings/files_api_rate_limits.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Configure rate limits for the repository files API on your self-managed GitLab instance."
+description: "Configure rate limits for the repository files API on GitLab Self-Managed."
 ---
 
 # Rate limits on Repository files API
diff --git a/doc/administration/settings/git_http_rate_limits.md b/doc/administration/settings/git_http_rate_limits.md
index c803027f343..3308acbdd28 100644
--- a/doc/administration/settings/git_http_rate_limits.md
+++ b/doc/administration/settings/git_http_rate_limits.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Configure rate limits on Git HTTP requests to your self-managed GitLab instance."
+description: "Configure rate limits on Git HTTP requests to GitLab Self-Managed."
 ---
 
 # Rate limits on Git HTTP
diff --git a/doc/administration/settings/git_lfs_rate_limits.md b/doc/administration/settings/git_lfs_rate_limits.md
index 0729b4763de..b5b8d3bf884 100644
--- a/doc/administration/settings/git_lfs_rate_limits.md
+++ b/doc/administration/settings/git_lfs_rate_limits.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Configure rate limits for Git LFS on your self-managed GitLab instance."
+description: "Configure rate limits for Git LFS on GitLab Self-Managed."
 ---
 
 # Rate limits on Git LFS
diff --git a/doc/administration/settings/instance_template_repository.md b/doc/administration/settings/instance_template_repository.md
index 2e3bccc85f5..ed5b3302b1d 100644
--- a/doc/administration/settings/instance_template_repository.md
+++ b/doc/administration/settings/instance_template_repository.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Configure a collection of file templates available for all projects on your self-managed GitLab instance."
+description: "Configure a collection of file templates available for all projects on GitLab Self-Managed."
 ---
 
 # Instance template repository
diff --git a/doc/administration/settings/jira_cloud_app_troubleshooting.md b/doc/administration/settings/jira_cloud_app_troubleshooting.md
index 45a5c6846b4..a0ac3a26261 100644
--- a/doc/administration/settings/jira_cloud_app_troubleshooting.md
+++ b/doc/administration/settings/jira_cloud_app_troubleshooting.md
@@ -56,7 +56,7 @@ To resolve this issue, disable the **Jira Connect Proxy URL** setting.
   1. Clear the **Jira Connect Proxy URL** text box.
   1. Select **Save changes**.
 
-If the issue persists, verify that your self-managed GitLab instance can connect to
+If the issue persists, verify that your instance can connect to
 `connect-install-keys.atlassian.com` to get the public key from Atlassian.
 To test connectivity, run the following command:
 
@@ -67,13 +67,13 @@ curl --head "https://connect-install-keys.atlassian.com"
 
 ## Data sync fails with `Invalid JWT`
 
-If the GitLab for Jira Cloud app continuously fails to sync data from a self-managed GitLab instance,
+If the GitLab for Jira Cloud app continuously fails to sync data from your instance,
 a secret token might be outdated. Atlassian can send new secret tokens to GitLab.
 If GitLab fails to process or store these tokens, an `Invalid JWT` error occurs.
 
-To resolve this issue on your self-managed GitLab instance:
+To resolve this issue:
 
-- Confirm your self-managed GitLab instance is publicly available to:
+- Confirm the instance is publicly available to:
   - GitLab.com (if you [installed the app from the official Atlassian Marketplace listing](jira_cloud_app.md#install-the-gitlab-for-jira-cloud-app-from-the-atlassian-marketplace)).
   - Jira Cloud (if you [installed the app manually](jira_cloud_app.md#install-the-gitlab-for-jira-cloud-app-manually)).
 - Ensure the token request sent to the `/-/jira_connect/events/installed` endpoint when you install the app is accessible from Jira.
@@ -83,7 +83,7 @@ To resolve this issue on your self-managed GitLab instance:
   curl --include --request POST "https://gitlab.example.com/-/jira_connect/events/installed"
   ```
 
-- If your self-managed GitLab instance has [SSL configured](https://docs.gitlab.com/omnibus/settings/ssl/), check your
+- If your instance has [SSL configured](https://docs.gitlab.com/omnibus/settings/ssl/), check your
   [certificates are valid and publicly trusted](https://docs.gitlab.com/omnibus/settings/ssl/ssl_troubleshooting.html#useful-openssl-debugging-commands).
 
 Depending on how you installed the app, you might want to check the following:
diff --git a/doc/administration/settings/push_event_activities_limit.md b/doc/administration/settings/push_event_activities_limit.md
index 0ec6417a141..26c32a601dd 100644
--- a/doc/administration/settings/push_event_activities_limit.md
+++ b/doc/administration/settings/push_event_activities_limit.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Configure limits on the number of single push events your self-managed GitLab instance will allow."
+description: "Configure limits on the number of single push events your instance will allow."
 ---
 
 # Push event activities limit and bulk push events
diff --git a/doc/administration/settings/rate_limits_on_git_ssh_operations.md b/doc/administration/settings/rate_limits_on_git_ssh_operations.md
index 9882de71b9b..33ec77f477c 100644
--- a/doc/administration/settings/rate_limits_on_git_ssh_operations.md
+++ b/doc/administration/settings/rate_limits_on_git_ssh_operations.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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
-description: "Configure rate limits on Git SSH operations on your self-managed GitLab instance."
+description: "Configure rate limits on Git SSH operations on GitLab Self-Managed."
 ---
 
 # Rate limits on Git SSH operations
diff --git a/doc/administration/settings/visibility_and_access_controls.md b/doc/administration/settings/visibility_and_access_controls.md
index 34e9e7e3b2b..ca7efcf7b72 100644
--- a/doc/administration/settings/visibility_and_access_controls.md
+++ b/doc/administration/settings/visibility_and_access_controls.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 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"
-description: "Control project visibility, creation, retention, and deletion on your self-managed GitLab instance."
+description: "Control project visibility, creation, retention, and deletion on GitLab Self-Managed."
 ---
 
 # Control access and visibility
diff --git a/doc/administration/troubleshooting/postgresql.md b/doc/administration/troubleshooting/postgresql.md
index 6417f2ceecf..e50d9bf797b 100644
--- a/doc/administration/troubleshooting/postgresql.md
+++ b/doc/administration/troubleshooting/postgresql.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Operations
 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
 ---
 
diff --git a/doc/administration/user_settings.md b/doc/administration/user_settings.md
index 7980724cc58..179d074fd46 100644
--- a/doc/administration/user_settings.md
+++ b/doc/administration/user_settings.md
@@ -14,7 +14,7 @@ You can modify settings for every user in your GitLab instance.
 
 ## Prerequisites
 
-- You must be an administrator of a self-managed GitLab instance.
+- You must be an administrator of GitLab Self-Managed.
 
 ## Prevent users from creating top-level groups
 
diff --git a/doc/api/database_migrations.md b/doc/api/database_migrations.md
index ffe3c30b75d..2ec96043cc2 100644
--- a/doc/api/database_migrations.md
+++ b/doc/api/database_migrations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 ---
 
diff --git a/doc/api/graphql/getting_started.md b/doc/api/graphql/getting_started.md
index 08a0b1cc6c2..da7ebe49092 100644
--- a/doc/api/graphql/getting_started.md
+++ b/doc/api/graphql/getting_started.md
@@ -34,7 +34,7 @@ For most people, using GraphiQL will be the easiest way to explore the GitLab Gr
 You can either use GraphiQL:
 
 - [On GitLab.com](https://gitlab.com/-/graphql-explorer).
-- On your self-managed GitLab instance on `https://<your-gitlab-site.com>/-/graphql-explorer`.
+- On GitLab Self-Managed on `https://<your-gitlab-site.com>/-/graphql-explorer`.
 
 Sign in to GitLab first to authenticate the requests with your GitLab account.
 
diff --git a/doc/api/graphql/index.md b/doc/api/graphql/index.md
index e4c19a17567..f3cd5a7f410 100644
--- a/doc/api/graphql/index.md
+++ b/doc/api/graphql/index.md
@@ -33,7 +33,7 @@ The GitLab GraphQL API endpoint is located at `/api/graphql`.
 Explore the GraphQL API using the interactive GraphQL explorer, either:
 
 - [On GitLab.com](https://gitlab.com/-/graphql-explorer).
-- On your self-managed GitLab instance on `https://<your-gitlab-site.com>/-/graphql-explorer`.
+- On GitLab Self-Managed on `https://<your-gitlab-site.com>/-/graphql-explorer`.
 
 For more information, see [GraphiQL](getting_started.md#graphiql).
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 51fefe26844..6ebad3ca698 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -12051,6 +12051,29 @@ The edge type for [`AiUserMetrics`](#aiusermetrics).
 | <a id="aiusermetricsedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
 | <a id="aiusermetricsedgenode"></a>`node` | [`AiUserMetrics`](#aiusermetrics) | The item at the end of the edge. |
 
+#### `AiXrayReportConnection`
+
+The connection type for [`AiXrayReport`](#aixrayreport).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="aixrayreportconnectionedges"></a>`edges` | [`[AiXrayReportEdge]`](#aixrayreportedge) | A list of edges. |
+| <a id="aixrayreportconnectionnodes"></a>`nodes` | [`[AiXrayReport]`](#aixrayreport) | A list of nodes. |
+| <a id="aixrayreportconnectionpageinfo"></a>`pageInfo` | [`PageInfo!`](#pageinfo) | Information to aid in pagination. |
+
+#### `AiXrayReportEdge`
+
+The edge type for [`AiXrayReport`](#aixrayreport).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="aixrayreportedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
+| <a id="aixrayreportedgenode"></a>`node` | [`AiXrayReport`](#aixrayreport) | The item at the end of the edge. |
+
 #### `AlertManagementAlertConnection`
 
 The connection type for [`AlertManagementAlert`](#alertmanagementalert).
@@ -19116,6 +19139,14 @@ Pre-aggregated per-user metrics for GitLab Code Suggestions and GitLab Duo Chat.
 | <a id="aiusermetricsduochatinteractionscount"></a>`duoChatInteractionsCount` | [`Int`](#int) | Number of user interactions with GitLab Duo Chat. |
 | <a id="aiusermetricsuser"></a>`user` | [`UserCore!`](#usercore) | User metrics. |
 
+### `AiXrayReport`
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="aixrayreportlanguage"></a>`language` | [`String!`](#string) | Language of the x-ray report. |
+
 ### `AlertManagementAlert`
 
 Describes an alert from the project's Alert Management.
@@ -31888,6 +31919,7 @@ Project-level settings for product analytics provider.
 | <a id="projectagentconfigurations"></a>`agentConfigurations` | [`AgentConfigurationConnection`](#agentconfigurationconnection) | Agent configurations defined by the project. (see [Connections](#connections)) |
 | <a id="projectaiagents"></a>`aiAgents` **{warning-solid}** | [`AiAgentConnection`](#aiagentconnection) | **Introduced** in GitLab 16.9. **Status**: Experiment. Ai Agents for the project. |
 | <a id="projectaiusagedata"></a>`aiUsageData` **{warning-solid}** | [`AiUsageData`](#aiusagedata) | **Introduced** in GitLab 17.5. **Status**: Experiment. AI-related data. |
+| <a id="projectaixrayreports"></a>`aiXrayReports` **{warning-solid}** | [`AiXrayReportConnection!`](#aixrayreportconnection) | **Introduced** in GitLab 17.8. **Status**: Experiment. X-ray reports of the project. |
 | <a id="projectallowmergeonskippedpipeline"></a>`allowMergeOnSkippedPipeline` | [`Boolean`](#boolean) | If `only_allow_merge_if_pipeline_succeeds` is true, indicates if merge requests of the project can also be merged with skipped jobs. |
 | <a id="projectallowedcustomstatuses"></a>`allowedCustomStatuses` **{warning-solid}** | [`WorkItemWidgetCustomStatusConnection`](#workitemwidgetcustomstatusconnection) | **Introduced** in GitLab 17.8. **Status**: Experiment. Allowed custom statuses for the project. |
 | <a id="projectallowsmultiplemergerequestassignees"></a>`allowsMultipleMergeRequestAssignees` | [`Boolean!`](#boolean) | Project allows assigning multiple users to a merge request. |
diff --git a/doc/ci/environments/deployments.md b/doc/ci/environments/deployments.md
index a3f90885555..541c7d55daa 100644
--- a/doc/ci/environments/deployments.md
+++ b/doc/ci/environments/deployments.md
@@ -156,7 +156,7 @@ When you work with deployments, you might encounter the following issues.
 GitLab [deletes old deployment refs](#archive-old-deployments)
 to keep your Git repository performant.
 
-If you have to restore archived Git-refs, ask an administrator of your self-managed GitLab instance
+If you have to restore archived Git-refs on GitLab Self-Managed, ask an administrator
 to execute the following command on Rails console:
 
 ```ruby
diff --git a/doc/ci/examples/index.md b/doc/ci/examples/index.md
index da195451ebc..c1eae5ebef3 100644
--- a/doc/ci/examples/index.md
+++ b/doc/ci/examples/index.md
@@ -108,7 +108,7 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** Self-managed, GitLab Dedicated
 
-You can add custom examples and templates to your self-managed GitLab instance.
+You can add custom examples and templates to your instance.
 Your GitLab administrator can [designate an instance template repository](../../administration/settings/instance_template_repository.md)
 that contains examples and templates specific to your organization.
 
diff --git a/doc/ci/runners/configure_runners.md b/doc/ci/runners/configure_runners.md
index 79d079e2986..38a455c1e05 100644
--- a/doc/ci/runners/configure_runners.md
+++ b/doc/ci/runners/configure_runners.md
@@ -29,7 +29,7 @@ Prerequisites:
 
 - You must be an administrator.
 
-You can override the job timeout for instance runners on self-managed GitLab installations only.
+You can override the job timeout for instance runners on GitLab Self-Managed.
 
 On GitLab.com, you cannot override the job timeout for GitLab hosted instance runners and must use the [project defined timeout](../pipelines/settings.md#set-a-limit-for-how-long-jobs-can-run) instead.
 
diff --git a/doc/ci/runners/runners_scope.md b/doc/ci/runners/runners_scope.md
index 9a8bc5aa02d..f9f354d432f 100644
--- a/doc/ci/runners/runners_scope.md
+++ b/doc/ci/runners/runners_scope.md
@@ -241,7 +241,7 @@ Prerequisites:
 
 - You must have the Owner role for the group.
 
-You can create a group runner for your self-managed GitLab instance or for GitLab.com.
+You can create a group runner for GitLab Self-Managed or for GitLab.com.
 When you create a runner, it is assigned a runner authentication token that you use to register it.
 The runner uses the token to authenticate with GitLab when it picks up jobs from the job queue.
 
@@ -306,7 +306,7 @@ Prerequisites:
 - You must have the Maintainer or Owner role for the group.
 
 You can view all runners for a group and its subgroups and projects.
-You can do this for your self-managed GitLab instance or for GitLab.com.
+You can do this for GitLab Self-Managed or for GitLab.com.
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. Select **Build > Runners**.
@@ -444,7 +444,7 @@ Prerequisites:
 
 - You must have the Maintainer role for the project.
 
-You can create a project runner for your self-managed GitLab instance or for GitLab.com. When you create a runner,
+You can create a project runner for GitLab Self-Managed or for GitLab.com. When you create a runner,
 it is assigned a runner authentication token that you use to register to the runner. The runner uses the token to
 authenticate with GitLab when it picks up jobs from the job queue.
 
diff --git a/doc/development/database/add_foreign_key_to_existing_column.md b/doc/development/database/add_foreign_key_to_existing_column.md
index 4a0e3a47633..6bf15a3bbe4 100644
--- a/doc/development/database/add_foreign_key_to_existing_column.md
+++ b/doc/development/database/add_foreign_key_to_existing_column.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/adding_database_indexes.md b/doc/development/database/adding_database_indexes.md
index d01ce9f14b3..793d4a0be1e 100644
--- a/doc/development/database/adding_database_indexes.md
+++ b/doc/development/database/adding_database_indexes.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/avoiding_downtime_in_migrations.md b/doc/development/database/avoiding_downtime_in_migrations.md
index ec4c297a8f5..2570552cf7e 100644
--- a/doc/development/database/avoiding_downtime_in_migrations.md
+++ b/doc/development/database/avoiding_downtime_in_migrations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/batched_background_migrations.md b/doc/development/database/batched_background_migrations.md
index d8dc2518009..12c0d3533a4 100644
--- a/doc/development/database/batched_background_migrations.md
+++ b/doc/development/database/batched_background_migrations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 info: "See the Technical Writers assigned to Development Guidelines: https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
 ---
 
diff --git a/doc/development/database/batching_best_practices.md b/doc/development/database/batching_best_practices.md
index 4024879f884..109f14188a6 100644
--- a/doc/development/database/batching_best_practices.md
+++ b/doc/development/database/batching_best_practices.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/ci_mirrored_tables.md b/doc/development/database/ci_mirrored_tables.md
index 31c16926c51..f1d453de4be 100644
--- a/doc/development/database/ci_mirrored_tables.md
+++ b/doc/development/database/ci_mirrored_tables.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/clickhouse/clickhouse_within_gitlab.md b/doc/development/database/clickhouse/clickhouse_within_gitlab.md
index 1e3184e1922..8faa4bce41e 100644
--- a/doc/development/database/clickhouse/clickhouse_within_gitlab.md
+++ b/doc/development/database/clickhouse/clickhouse_within_gitlab.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: none
+group: unassigned
 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.
 ---
 
diff --git a/doc/development/database/clickhouse/gitlab_activity_data.md b/doc/development/database/clickhouse/gitlab_activity_data.md
index dc7cf04ad0f..1577d6f631e 100644
--- a/doc/development/database/clickhouse/gitlab_activity_data.md
+++ b/doc/development/database/clickhouse/gitlab_activity_data.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: none
+group: unassigned
 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.
 ---
 
diff --git a/doc/development/database/clickhouse/index.md b/doc/development/database/clickhouse/index.md
index 99da7d6deb9..6fbdbd7760f 100644
--- a/doc/development/database/clickhouse/index.md
+++ b/doc/development/database/clickhouse/index.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: none
+group: unassigned
 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.
 ---
 
diff --git a/doc/development/database/clickhouse/merge_request_analytics.md b/doc/development/database/clickhouse/merge_request_analytics.md
index aa04d9a4fe1..54635cf0603 100644
--- a/doc/development/database/clickhouse/merge_request_analytics.md
+++ b/doc/development/database/clickhouse/merge_request_analytics.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: none
+group: unassigned
 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.
 ---
 
diff --git a/doc/development/database/clickhouse/optimization.md b/doc/development/database/clickhouse/optimization.md
index 4bf66ff6bec..c794ed63d60 100644
--- a/doc/development/database/clickhouse/optimization.md
+++ b/doc/development/database/clickhouse/optimization.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: none
+group: unassigned
 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.
 ---
 
diff --git a/doc/development/database/clickhouse/tiered_storage.md b/doc/development/database/clickhouse/tiered_storage.md
index 711cb5f281c..080e124fe5d 100644
--- a/doc/development/database/clickhouse/tiered_storage.md
+++ b/doc/development/database/clickhouse/tiered_storage.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: none
+group: unassigned
 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.
 ---
 
diff --git a/doc/development/database/client_side_connection_pool.md b/doc/development/database/client_side_connection_pool.md
index ee7d37302c2..3abf493b39f 100644
--- a/doc/development/database/client_side_connection_pool.md
+++ b/doc/development/database/client_side_connection_pool.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/constraint_naming_convention.md b/doc/development/database/constraint_naming_convention.md
index 3b4f2e92b98..0a4a3a6c1db 100644
--- a/doc/development/database/constraint_naming_convention.md
+++ b/doc/development/database/constraint_naming_convention.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/creating_enums.md b/doc/development/database/creating_enums.md
index bc83b1a022b..644d495ab26 100644
--- a/doc/development/database/creating_enums.md
+++ b/doc/development/database/creating_enums.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/database_debugging.md b/doc/development/database/database_debugging.md
index 35a5265b499..d3906a6eb14 100644
--- a/doc/development/database/database_debugging.md
+++ b/doc/development/database/database_debugging.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/database_dictionary.md b/doc/development/database/database_dictionary.md
index 21cdc6cef34..61641605cf4 100644
--- a/doc/development/database/database_dictionary.md
+++ b/doc/development/database/database_dictionary.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/database_lab.md b/doc/development/database/database_lab.md
index 3175f31bc26..3db226f377d 100644
--- a/doc/development/database/database_lab.md
+++ b/doc/development/database/database_lab.md
@@ -1,6 +1,9 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
+type: reference, howto
+discretionary: yes
+description: Database access for engineers and related parties.
 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.
 ---
 
diff --git a/doc/development/database/database_lab_pgai.md b/doc/development/database/database_lab_pgai.md
index 7ebdcf61a9c..f4a4d3505b0 100644
--- a/doc/development/database/database_lab_pgai.md
+++ b/doc/development/database/database_lab_pgai.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/database_migration_pipeline.md b/doc/development/database/database_migration_pipeline.md
index b822ca78d2c..efe94ffdb47 100644
--- a/doc/development/database/database_migration_pipeline.md
+++ b/doc/development/database/database_migration_pipeline.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/database_query_comments.md b/doc/development/database/database_query_comments.md
index a82c5f41326..0f4df67d03b 100644
--- a/doc/development/database/database_query_comments.md
+++ b/doc/development/database/database_query_comments.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/database_reviewer_guidelines.md b/doc/development/database/database_reviewer_guidelines.md
index 97c6969c53e..fbe751dcba9 100644
--- a/doc/development/database/database_reviewer_guidelines.md
+++ b/doc/development/database/database_reviewer_guidelines.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/db_dump.md b/doc/development/database/db_dump.md
index f22636ab042..c336694b28a 100644
--- a/doc/development/database/db_dump.md
+++ b/doc/development/database/db_dump.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/dbcheck-migrations-job.md b/doc/development/database/dbcheck-migrations-job.md
index be0b80eed65..188a263f5b5 100644
--- a/doc/development/database/dbcheck-migrations-job.md
+++ b/doc/development/database/dbcheck-migrations-job.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/dbmigrate_multi_version_upgrade_job.md b/doc/development/database/dbmigrate_multi_version_upgrade_job.md
index 7c262ef57ed..93e5d09652f 100644
--- a/doc/development/database/dbmigrate_multi_version_upgrade_job.md
+++ b/doc/development/database/dbmigrate_multi_version_upgrade_job.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/deduplicate_database_records.md b/doc/development/database/deduplicate_database_records.md
index a9737436e40..97277d5f4b3 100644
--- a/doc/development/database/deduplicate_database_records.md
+++ b/doc/development/database/deduplicate_database_records.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/deleting_migrations.md b/doc/development/database/deleting_migrations.md
index 72a69a696f5..07387dcf47e 100644
--- a/doc/development/database/deleting_migrations.md
+++ b/doc/development/database/deleting_migrations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/efficient_in_operator_queries.md b/doc/development/database/efficient_in_operator_queries.md
index 58461f77d37..e36255c9615 100644
--- a/doc/development/database/efficient_in_operator_queries.md
+++ b/doc/development/database/efficient_in_operator_queries.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/foreign_keys.md b/doc/development/database/foreign_keys.md
index 450b81d7a5a..607e9d28202 100644
--- a/doc/development/database/foreign_keys.md
+++ b/doc/development/database/foreign_keys.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/hash_indexes.md b/doc/development/database/hash_indexes.md
index 8198459bd39..3474b723608 100644
--- a/doc/development/database/hash_indexes.md
+++ b/doc/development/database/hash_indexes.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/index.md b/doc/development/database/index.md
index d4f247f6a23..b1567e78533 100644
--- a/doc/development/database/index.md
+++ b/doc/development/database/index.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/insert_into_tables_in_batches.md b/doc/development/database/insert_into_tables_in_batches.md
index 2377a5805df..1d25c3784ad 100644
--- a/doc/development/database/insert_into_tables_in_batches.md
+++ b/doc/development/database/insert_into_tables_in_batches.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 description: "Sometimes it is necessary to store large amounts of records at once, which can be inefficient
 when iterating collections and performing individual `save`s. With the arrival of `insert_all`
diff --git a/doc/development/database/iterating_tables_in_batches.md b/doc/development/database/iterating_tables_in_batches.md
index d8ae1044d9c..0acc932ad3e 100644
--- a/doc/development/database/iterating_tables_in_batches.md
+++ b/doc/development/database/iterating_tables_in_batches.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/keyset_pagination.md b/doc/development/database/keyset_pagination.md
index 8f546acbeba..333cc0b7df9 100644
--- a/doc/development/database/keyset_pagination.md
+++ b/doc/development/database/keyset_pagination.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/layout_and_access_patterns.md b/doc/development/database/layout_and_access_patterns.md
index edb355f72bc..b6ce18b95c0 100644
--- a/doc/development/database/layout_and_access_patterns.md
+++ b/doc/development/database/layout_and_access_patterns.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/load_balancing.md b/doc/development/database/load_balancing.md
index 9ec6ef6fce7..a7df1d355c9 100644
--- a/doc/development/database/load_balancing.md
+++ b/doc/development/database/load_balancing.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/loose_foreign_keys.md b/doc/development/database/loose_foreign_keys.md
index 7ce6a7e6584..114354a4a73 100644
--- a/doc/development/database/loose_foreign_keys.md
+++ b/doc/development/database/loose_foreign_keys.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/maintenance_operations.md b/doc/development/database/maintenance_operations.md
index aa6d145cf4f..7c57fe132c0 100644
--- a/doc/development/database/maintenance_operations.md
+++ b/doc/development/database/maintenance_operations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/migration_ordering.md b/doc/development/database/migration_ordering.md
index 51dd7cb118d..a820fa0a37f 100644
--- a/doc/development/database/migration_ordering.md
+++ b/doc/development/database/migration_ordering.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/migrations_for_multiple_databases.md b/doc/development/database/migrations_for_multiple_databases.md
index 879c481c91e..e0145677934 100644
--- a/doc/development/database/migrations_for_multiple_databases.md
+++ b/doc/development/database/migrations_for_multiple_databases.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/new_database_migration_version.md b/doc/development/database/new_database_migration_version.md
index 6d7f1b2b382..f0fd96c5038 100644
--- a/doc/development/database/new_database_migration_version.md
+++ b/doc/development/database/new_database_migration_version.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/not_null_constraints.md b/doc/development/database/not_null_constraints.md
index 1a45ae4aa98..9dd9ec2eb7b 100644
--- a/doc/development/database/not_null_constraints.md
+++ b/doc/development/database/not_null_constraints.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/offset_pagination_optimization.md b/doc/development/database/offset_pagination_optimization.md
index 4f6b50b46ef..70ca3da051f 100644
--- a/doc/development/database/offset_pagination_optimization.md
+++ b/doc/development/database/offset_pagination_optimization.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/ordering_table_columns.md b/doc/development/database/ordering_table_columns.md
index a97e1f60a2d..61755485aec 100644
--- a/doc/development/database/ordering_table_columns.md
+++ b/doc/development/database/ordering_table_columns.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/pagination_guidelines.md b/doc/development/database/pagination_guidelines.md
index 3c58fad4336..99a6f9f48fa 100644
--- a/doc/development/database/pagination_guidelines.md
+++ b/doc/development/database/pagination_guidelines.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/pagination_performance_guidelines.md b/doc/development/database/pagination_performance_guidelines.md
index 9c545583013..c12ae7a003a 100644
--- a/doc/development/database/pagination_performance_guidelines.md
+++ b/doc/development/database/pagination_performance_guidelines.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/partitioning/date_range.md b/doc/development/database/partitioning/date_range.md
index 15962b61612..8eba35e188b 100644
--- a/doc/development/database/partitioning/date_range.md
+++ b/doc/development/database/partitioning/date_range.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/partitioning/hash.md b/doc/development/database/partitioning/hash.md
index 8852097d89a..b173e4d6f3a 100644
--- a/doc/development/database/partitioning/hash.md
+++ b/doc/development/database/partitioning/hash.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/partitioning/index.md b/doc/development/database/partitioning/index.md
index b88a6ec458d..f65d5c62c8e 100644
--- a/doc/development/database/partitioning/index.md
+++ b/doc/development/database/partitioning/index.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/partitioning/int_range.md b/doc/development/database/partitioning/int_range.md
index 06b1d63471f..eb1194db07c 100644
--- a/doc/development/database/partitioning/int_range.md
+++ b/doc/development/database/partitioning/int_range.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/partitioning/list.md b/doc/development/database/partitioning/list.md
index 7ca43a9e502..02bd7cc66ff 100644
--- a/doc/development/database/partitioning/list.md
+++ b/doc/development/database/partitioning/list.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/poc_tree_iterator.md b/doc/development/database/poc_tree_iterator.md
index 0eddf71830f..5854946f8e7 100644
--- a/doc/development/database/poc_tree_iterator.md
+++ b/doc/development/database/poc_tree_iterator.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/polymorphic_associations.md b/doc/development/database/polymorphic_associations.md
index 54ef1c27229..7188a883b9c 100644
--- a/doc/development/database/polymorphic_associations.md
+++ b/doc/development/database/polymorphic_associations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/post_deployment_migrations.md b/doc/development/database/post_deployment_migrations.md
index 230a9a05b29..be5d38a5328 100644
--- a/doc/development/database/post_deployment_migrations.md
+++ b/doc/development/database/post_deployment_migrations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/query_count_limits.md b/doc/development/database/query_count_limits.md
index d02b02cf239..2533787f059 100644
--- a/doc/development/database/query_count_limits.md
+++ b/doc/development/database/query_count_limits.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/query_performance.md b/doc/development/database/query_performance.md
index ed03ce4f182..8a2ba4c3874 100644
--- a/doc/development/database/query_performance.md
+++ b/doc/development/database/query_performance.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/query_recorder.md b/doc/development/database/query_recorder.md
index 81fc94ea055..3b282a38f60 100644
--- a/doc/development/database/query_recorder.md
+++ b/doc/development/database/query_recorder.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/rename_database_tables.md b/doc/development/database/rename_database_tables.md
index 327a23d495e..4b80484c963 100644
--- a/doc/development/database/rename_database_tables.md
+++ b/doc/development/database/rename_database_tables.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/required_stops.md b/doc/development/database/required_stops.md
index 2b93b75fc1e..cd8425423f8 100644
--- a/doc/development/database/required_stops.md
+++ b/doc/development/database/required_stops.md
@@ -1,5 +1,5 @@
 ---
-stage: Data Stores
+stage: Data Access
 group: Database
 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.
 ---
diff --git a/doc/development/database/scalability/patterns/index.md b/doc/development/database/scalability/patterns/index.md
index 88f6914b01b..e51ea88dfcc 100644
--- a/doc/development/database/scalability/patterns/index.md
+++ b/doc/development/database/scalability/patterns/index.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 description: 'Learn how to scale the database through the use of best-of-class database scalability patterns'
 ---
diff --git a/doc/development/database/scalability/patterns/read_mostly.md b/doc/development/database/scalability/patterns/read_mostly.md
index 6977455d2e2..f39019e9a46 100644
--- a/doc/development/database/scalability/patterns/read_mostly.md
+++ b/doc/development/database/scalability/patterns/read_mostly.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 description: 'Learn how to scale operating on read-mostly data at scale'
 ---
diff --git a/doc/development/database/scalability/patterns/time_decay.md b/doc/development/database/scalability/patterns/time_decay.md
index 4e953ad6d85..13fbdbd37fa 100644
--- a/doc/development/database/scalability/patterns/time_decay.md
+++ b/doc/development/database/scalability/patterns/time_decay.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 description: 'Learn how to operate on large time-decay data'
 ---
diff --git a/doc/development/database/serializing_data.md b/doc/development/database/serializing_data.md
index 64b7e19f528..aa00946dec6 100644
--- a/doc/development/database/serializing_data.md
+++ b/doc/development/database/serializing_data.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/setting_multiple_values.md b/doc/development/database/setting_multiple_values.md
index 825f3a102d7..c52dd46070c 100644
--- a/doc/development/database/setting_multiple_values.md
+++ b/doc/development/database/setting_multiple_values.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/sha1_as_binary.md b/doc/development/database/sha1_as_binary.md
index bd955c61441..957bb5ba950 100644
--- a/doc/development/database/sha1_as_binary.md
+++ b/doc/development/database/sha1_as_binary.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/single_table_inheritance.md b/doc/development/database/single_table_inheritance.md
index ecc42a3b5d1..f8667212194 100644
--- a/doc/development/database/single_table_inheritance.md
+++ b/doc/development/database/single_table_inheritance.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/strings_and_the_text_data_type.md b/doc/development/database/strings_and_the_text_data_type.md
index fc2d2eb40ae..612e15561a2 100644
--- a/doc/development/database/strings_and_the_text_data_type.md
+++ b/doc/development/database/strings_and_the_text_data_type.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/swapping_tables.md b/doc/development/database/swapping_tables.md
index 1c634c6a83e..ecf8216836b 100644
--- a/doc/development/database/swapping_tables.md
+++ b/doc/development/database/swapping_tables.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/transaction_guidelines.md b/doc/development/database/transaction_guidelines.md
index e93207fb6d2..400723c6391 100644
--- a/doc/development/database/transaction_guidelines.md
+++ b/doc/development/database/transaction_guidelines.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/understanding_explain_plans.md b/doc/development/database/understanding_explain_plans.md
index 2b2cc300180..be9eda54aef 100644
--- a/doc/development/database/understanding_explain_plans.md
+++ b/doc/development/database/understanding_explain_plans.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database/verifying_database_capabilities.md b/doc/development/database/verifying_database_capabilities.md
index f39ce0ae30c..c2406e54ede 100644
--- a/doc/development/database/verifying_database_capabilities.md
+++ b/doc/development/database/verifying_database_capabilities.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/database_review.md b/doc/development/database_review.md
index b46927dbe6a..c328dcc40eb 100644
--- a/doc/development/database_review.md
+++ b/doc/development/database_review.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/graphql_guide/batchloader.md b/doc/development/graphql_guide/batchloader.md
index 797c81a8695..292f704fea6 100644
--- a/doc/development/graphql_guide/batchloader.md
+++ b/doc/development/graphql_guide/batchloader.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/internal_analytics/internal_event_instrumentation/local_setup_and_debugging.md b/doc/development/internal_analytics/internal_event_instrumentation/local_setup_and_debugging.md
index fb57ef20bc5..b36f334cc5c 100644
--- a/doc/development/internal_analytics/internal_event_instrumentation/local_setup_and_debugging.md
+++ b/doc/development/internal_analytics/internal_event_instrumentation/local_setup_and_debugging.md
@@ -155,7 +155,7 @@ It works in production, staging, and local development environments. It is espec
 
 On GitLab.com events are sent to a collector configured by GitLab. By default, self-managed instances do not have a collector configured and do not collect data with Snowplow.
 
-You can configure your self-managed GitLab instance to use a custom Snowplow collector.
+You can configure your instance to use a custom Snowplow collector.
 
 1. On the left sidebar, at the bottom, select **Admin**.
 1. Select **Settings > General**.
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index b47ec0dfa00..c42cff21d86 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/sql.md b/doc/development/sql.md
index 320c851ef95..54fa82f6a00 100644
--- a/doc/development/sql.md
+++ b/doc/development/sql.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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.
 ---
 
diff --git a/doc/development/uploads/working_with_uploads.md b/doc/development/uploads/working_with_uploads.md
index 6fa9ed25257..e44487109d1 100644
--- a/doc/development/uploads/working_with_uploads.md
+++ b/doc/development/uploads/working_with_uploads.md
@@ -45,7 +45,7 @@ adding new buckets for the following reasons:
 
 - Using a new bucket adds to development time because you need to make downstream changes in [GDK](https://gitlab.com/gitlab-org/gitlab-development-kit), [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab) and [CNG](https://gitlab.com/gitlab-org/build/CNG).
 - Using a new bucket requires GitLab.com Infrastructure changes, which slows down the roll-out of your new feature
-- Using a new bucket slows down adoption of your new feature for self-managed GitLab installation: people cannot start using your new feature until their local GitLab administrator has configured the new bucket.
+- Using a new bucket slows down adoption of your new feature for GitLab Self-Managed: people cannot start using your new feature until their local GitLab administrator has configured the new bucket.
 
 By using an existing bucket you avoid all this extra work
 and friction. The `Gitlab.config.uploads` storage location, which is what
diff --git a/doc/editor_extensions/jetbrains_ide/setup.md b/doc/editor_extensions/jetbrains_ide/setup.md
index c4c9bb936b8..5cf80d845cc 100644
--- a/doc/editor_extensions/jetbrains_ide/setup.md
+++ b/doc/editor_extensions/jetbrains_ide/setup.md
@@ -34,7 +34,7 @@ After you install the extension, connect it to your GitLab account.
 
 ### Create a personal access token
 
-If you are on a self-managed GitLab instance, create a personal access token.
+If you are on GitLab Self-Managed, create a personal access token.
 
 1. In GitLab, on the left sidebar, select your avatar.
 1. Select **Edit profile**.
diff --git a/doc/editor_extensions/visual_studio/setup.md b/doc/editor_extensions/visual_studio/setup.md
index 3759c8d09f1..e6ffdc6f19c 100644
--- a/doc/editor_extensions/visual_studio/setup.md
+++ b/doc/editor_extensions/visual_studio/setup.md
@@ -28,7 +28,7 @@ After you download and install the extension, connect it to your GitLab account.
 
 ### Create a personal access token
 
-If you are on a self-managed GitLab instance, create a personal access token.
+If you are on GitLab Self-Managed, create a personal access token.
 
 1. On the left sidebar, select your avatar.
 1. Select **Edit profile**.
diff --git a/doc/editor_extensions/visual_studio_code/setup.md b/doc/editor_extensions/visual_studio_code/setup.md
index e433fcb6823..eb5e036d3b1 100644
--- a/doc/editor_extensions/visual_studio_code/setup.md
+++ b/doc/editor_extensions/visual_studio_code/setup.md
@@ -20,7 +20,7 @@ After you download and install the extension, connect it to your GitLab account.
 
 ### Create a personal access token
 
-If you are on a self-managed GitLab instance, create a personal access token.
+If you are on GitLab Self-Managed, create a personal access token.
 
 1. On the left sidebar, select your avatar.
 1. Select **Edit profile**.
diff --git a/doc/editor_extensions/visual_studio_code/troubleshooting.md b/doc/editor_extensions/visual_studio_code/troubleshooting.md
index 03f4542477f..4b7a76847c8 100644
--- a/doc/editor_extensions/visual_studio_code/troubleshooting.md
+++ b/doc/editor_extensions/visual_studio_code/troubleshooting.md
@@ -63,9 +63,9 @@ Prerequisites:
 | Setting name | Default | Information |
 | ------------ | :-----: | ----------- |
 | `gitlab.ca`  | null    | Deprecated. See [the SSL setup guide](ssl.md) for more information on how to set up your self-signed CA. |
-| `gitlab.cert`| null    | Unsupported. See [epic 6244](https://gitlab.com/groups/gitlab-org/-/epics/6244). If your self-managed GitLab instance requires a custom certificate or key pair, set this option to point to your certificate file. See `gitlab.certKey`. |
-| `gitlab.certKey`| null    | Unsupported. See [epic 6244](https://gitlab.com/groups/gitlab-org/-/epics/6244). If your self-managed GitLab instance requires a custom certificate or key pair, set this option to point to your certificate key file. See `gitlab.cert`. |
-| `gitlab.ignoreCertificateErrors` | false   | Unsupported. See [epic 6244](https://gitlab.com/groups/gitlab-org/-/epics/6244). If you use a self-managed GitLab instance with no SSL certificate, or have certificate issues that prevent you from using the extension, set this option to `true` to ignore certificate errors. |
+| `gitlab.cert`| null    | Unsupported. See [epic 6244](https://gitlab.com/groups/gitlab-org/-/epics/6244). If GitLab Self-Managed requires a custom certificate or key pair, set this option to point to your certificate file. See `gitlab.certKey`. |
+| `gitlab.certKey`| null    | Unsupported. See [epic 6244](https://gitlab.com/groups/gitlab-org/-/epics/6244). If GitLab Self-Managed requires a custom certificate or key pair, set this option to point to your certificate key file. See `gitlab.cert`. |
+| `gitlab.ignoreCertificateErrors` | false   | Unsupported. See [epic 6244](https://gitlab.com/groups/gitlab-org/-/epics/6244). If you use GitLab Self-Managed with no SSL certificate, or have certificate issues that prevent you from using the extension, set this option to `true` to ignore certificate errors. |
 
 ## HTTPS project cloning works but SSH cloning fails
 
diff --git a/doc/index.md b/doc/index.md
index ccc52176d35..b9fc908f7f5 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -21,7 +21,7 @@ Explore the different areas of the documentation:
 
 |                         |                         |
 |:------------------------|:------------------------|
-| [**Use GitLab**](user/index.md)<br>Get started with GitLab features and functionality. | [**Administer GitLab**](administration/index.md)<br/>Administer a self-managed GitLab instance. |
+| [**Use GitLab**](user/index.md)<br>Get started with GitLab features and functionality. | [**Administer GitLab**](administration/index.md)<br/>Administer GitLab Self-Managed. |
 | [**New to Git and GitLab?**](tutorials/index.md)<br/>Start learning about Git and GitLab. | [**Contribute to GitLab development**](#contribute-to-gitlab)<br/>Create new GitLab functionality and documentation. |
 | [**Coming to GitLab from another platform?**](#coming-to-gitlab-from-another-platform)<br/>Learn how to move to GitLab. | [**Build an integration with GitLab**](#build-an-integration-with-gitlab)<br/>Integrate with Jira and other common applications. |
 | [**Choose a subscription**](subscriptions/index.md)<br/>Determine which subscription tier makes sense for you. | [**Install GitLab**](install/index.md)<br/>Install GitLab on different platforms. |
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index f143cd65b0c..fa177bb8f51 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -90,7 +90,7 @@ To configure the GitLab for Jira Cloud app:
    - **GitLab for Jira (gitlab.com)** if you [installed the app from the Atlassian Marketplace](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?tab=overview&hosting=cloud).
    - **GitLab for Jira (`<gitlab.example.com>`)** if you [installed the app manually](../../administration/settings/jira_cloud_app.md#install-the-gitlab-for-jira-cloud-app-manually).
 1. Select **Get started**.
-1. Optional. To link a self-managed GitLab instance with Jira, select **Change GitLab version**.
+1. Optional. To link GitLab Self-Managed with Jira, select **Change GitLab version**.
    1. Select all checkboxes, then select **Next**.
    1. Enter your **GitLab instance URL**, then select **Save**.
 1. Select **Sign in to GitLab**.
diff --git a/doc/security/hardening_operating_system_recommendations.md b/doc/security/hardening_operating_system_recommendations.md
index 966688245d3..95c56f1cf0d 100644
--- a/doc/security/hardening_operating_system_recommendations.md
+++ b/doc/security/hardening_operating_system_recommendations.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 General hardening guidelines are outlined in the [main hardening documentation](hardening.md).
 
 You can configure the underlying operating system to increase overall security. In a
-controlled environment such as a self-managed GitLab instance it requires additional
+controlled environment such as GitLab Self-Managed it requires additional
 steps, and in fact is often required for certain deployments. FedRAMP is an example of
 such a deployment.
 
diff --git a/doc/security/reset_user_password.md b/doc/security/reset_user_password.md
index 31b5a555b4f..17a5fb8900f 100644
--- a/doc/security/reset_user_password.md
+++ b/doc/security/reset_user_password.md
@@ -15,7 +15,7 @@ You can reset user passwords by using the UI, a Rake task, a Rails console, or t
 
 ## Prerequisites
 
-- You must be an administrator of a self-managed GitLab instance.
+- You must be an administrator of GitLab Self-Managed.
 - The new password must meet all [password requirements](../user/profile/user_passwords.md#password-requirements).
 
 ## Use the UI
diff --git a/doc/security/responding_to_security_incidents.md b/doc/security/responding_to_security_incidents.md
index 2105b8886b0..9be5d9b123a 100644
--- a/doc/security/responding_to_security_incidents.md
+++ b/doc/security/responding_to_security_incidents.md
@@ -188,7 +188,7 @@ Before you ask GitLab for help, search the [GitLab documentation](https://docs.g
 
 ### Security best practices
 
-Review the [GitLab Security documentation](../security/index.md) for what suggestions will work best for your environment and needs. If you are running a self-managed GitLab instance, consider reviewing our [diagram of GitLab components](../development/architecture.md#simplified-component-overview) to familiarize yourself with the various parts of a GitLab installation.
+Review the [GitLab Security documentation](../security/index.md) for what suggestions will work best for your environment and needs. For GitLab Self-Managed, consider reviewing our [diagram of GitLab components](../development/architecture.md#simplified-component-overview) to familiarize yourself with the various parts of a GitLab installation.
 
 #### Hardening Recommendations
 
diff --git a/doc/security/unlock_user.md b/doc/security/unlock_user.md
index 3d259d79b47..d75029d8f1e 100644
--- a/doc/security/unlock_user.md
+++ b/doc/security/unlock_user.md
@@ -39,7 +39,7 @@ Administrators can unlock accounts immediately by using the following tasks:
 
 Prerequisites
 
-- You must be an administrator of a self-managed GitLab instance.
+- You must be an administrator of GitLab Self-Managed.
 
 To unlock an account from the Admin area:
 
@@ -54,7 +54,7 @@ The user can now sign in.
 
 Prerequisites
 
-- You must be an administrator of a self-managed GitLab instance.
+- You must be an administrator of GitLab Self-Managed.
 
 To unlock an account from the command line:
 
diff --git a/doc/solutions/cloud/aws/gitlab_aws_integration.md b/doc/solutions/cloud/aws/gitlab_aws_integration.md
index 89668569bd1..65ea99f69f4 100644
--- a/doc/solutions/cloud/aws/gitlab_aws_integration.md
+++ b/doc/solutions/cloud/aws/gitlab_aws_integration.md
@@ -58,7 +58,7 @@ AWS Services that are supported directly by a CodeStar Connection in an AWS acco
 Documentation and References:
 
 - [Creating a GitLab CodeStar Connection to a GitLab.com Project](https://docs.aws.amazon.com/codepipeline/latest/userguide/connections-gitlab-managed.html)
-- [Creating a AWS CodeStar Connection for a Self-Managed GitLab Instance or GitLab Dedicated Instance](https://docs.aws.amazon.com/codepipeline/latest/userguide/connections-gitlab-managed.html) (must allow Internet Ingress from AWS or use a VPC connection)
+- [Creating a AWS CodeStar Connection for GitLab Self-Managed or GitLab Dedicated](https://docs.aws.amazon.com/codepipeline/latest/userguide/connections-gitlab-managed.html) (must allow Internet Ingress from AWS or use a VPC connection)
 
 #### AWS CodePipeline Integrations
 
@@ -71,7 +71,7 @@ AWS Services that are supported by an AWS CodePipeline integration:
 Documentation and References:
 
 - [Creating a GitLab CodePipeline Integration to a GitLab.com Project](https://docs.aws.amazon.com/codepipeline/latest/userguide/connections-gitlab-managed.html)
-- [Creating a AWS CodePipeline Integration for a Self-Managed GitLab Instance or GitLab Dedicated Instance](https://docs.aws.amazon.com/codepipeline/latest/userguide/connections-gitlab-managed.html) (must allow Internet Ingress from AWS or use a VPC connection)
+- [Creating a AWS CodePipeline Integration for GitLab Self-Managed or GitLab Dedicated](https://docs.aws.amazon.com/codepipeline/latest/userguide/connections-gitlab-managed.html) (must allow Internet Ingress from AWS or use a VPC connection)
 
 #### CodeStar Connections enabled AWS services that are not yet supported for GitLab
 
diff --git a/doc/tutorials/manage_user/index.md b/doc/tutorials/manage_user/index.md
index fec699354d3..fbffeb0e4d4 100644
--- a/doc/tutorials/manage_user/index.md
+++ b/doc/tutorials/manage_user/index.md
@@ -41,14 +41,14 @@ You're going to create:
 
 ## Before you begin
 
-- Make sure you have administrator access to your self-managed GitLab instance.
+- Make sure you have administrator access to GitLab Self-Managed.
 
 ## Create the organization parent group and subgroups
 
 You first create a group, Development, to serve as the parent group for the whole
 software development organization.
 
-1. Open your self-managed GitLab instance.
+1. Open GitLab Self-Managed.
 1. On the left sidebar, at the top, select **Create new** (**{plus}**) and **New group**.
 1. Select **Create group**.
 1. In **Group name**, enter `Development`.
diff --git a/doc/tutorials/observability/observability_java_tutorial.md b/doc/tutorials/observability/observability_java_tutorial.md
index 52b2a72d03b..0a54db779f9 100644
--- a/doc/tutorials/observability/observability_java_tutorial.md
+++ b/doc/tutorials/observability/observability_java_tutorial.md
@@ -101,7 +101,7 @@ The OpenTelemetry autoconfigure libraries read their configuration from environm
 
    ![Configuration menu](img/java_configuration_menu_v17_3.png)
 
-1. Add the following set of environment variables, replacing `{{PATH_TO_JAVA_AGENT}}`, `{{PROJECT_ID}}`, `{{PROJECT_ACCESS_TOKEN}}` and `{{SERVICE_NAME}}` with the correct values. If using a self-managed GitLab instance, replace `gitlab.com` with your self-managed instance hostname.
+1. Add the following set of environment variables, replacing `{{PATH_TO_JAVA_AGENT}}`, `{{PROJECT_ID}}`, `{{PROJECT_ACCESS_TOKEN}}` and `{{SERVICE_NAME}}` with the correct values. If using GitLab Self-Managed, replace `gitlab.com` with your self-managed instance hostname.
    - `JAVA_TOOL_OPTIONS=-javaagent:{{PATH_TO_JAVA_AGENT}}/opentelemetry-javaagent.jar`
    - `OTEL_EXPORTER_OTLP_ENDPOINT=https://gitlab.com/api/v4/projects/{{PROJECT_ID}}/observability`
    - `OTEL_EXPORTER_OTLP_HEADERS=PRIVATE-TOKEN\={{PROJECT_ACCESS_TOKEN}}`
diff --git a/doc/tutorials/observability/observability_nodejs_tutorial.md b/doc/tutorials/observability/observability_nodejs_tutorial.md
index 54e3f8a851a..fe55d37c71d 100644
--- a/doc/tutorials/observability/observability_nodejs_tutorial.md
+++ b/doc/tutorials/observability/observability_nodejs_tutorial.md
@@ -83,7 +83,7 @@ Next, we need to instrument the NodeJS application.
    ```
 
    Be sure to replace the `PROJECT_ID`, and `ACCESS_TOKEN` with the values you obtained earlier.
-   If using a self-managed GitLab instance, replace `gitlab.com` with your self-managed instance hostname.
+   If using GitLab Self-Managed, replace `gitlab.com` with your self-managed instance hostname.
 
 ## View traces
 
diff --git a/doc/tutorials/observability/observability_rails_tutorial.md b/doc/tutorials/observability/observability_rails_tutorial.md
index 14fcc398c4b..0e66ed32a2b 100644
--- a/doc/tutorials/observability/observability_rails_tutorial.md
+++ b/doc/tutorials/observability/observability_rails_tutorial.md
@@ -102,7 +102,7 @@ To create an application:
    ```
 
    Be sure to replace the `PROJECT_ID`, and `ACCESS_TOKEN` with the values you obtained earlier.
-   If using a self-managed GitLab instance, replace `gitlab.com` with your self-managed instance hostname.
+   If using GitLab Self-Managed, replace `gitlab.com` with your self-managed instance hostname.
 
 ## View traces
 
diff --git a/doc/update/background_migrations.md b/doc/update/background_migrations.md
index 8117d76d3fc..5774be90f53 100644
--- a/doc/update/background_migrations.md
+++ b/doc/update/background_migrations.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 ---
 
diff --git a/doc/update/background_migrations_troubleshooting.md b/doc/update/background_migrations_troubleshooting.md
index 56b31debb8c..739db4d1e38 100644
--- a/doc/update/background_migrations_troubleshooting.md
+++ b/doc/update/background_migrations_troubleshooting.md
@@ -1,6 +1,6 @@
 ---
-stage: Data Stores
-group: Database
+stage: Data Access
+group: Database Frameworks
 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
 ---
 
diff --git a/doc/user/application_security/policies/index.md b/doc/user/application_security/policies/index.md
index aa6b980de12..331e3073901 100644
--- a/doc/user/application_security/policies/index.md
+++ b/doc/user/application_security/policies/index.md
@@ -450,14 +450,6 @@ Use the policy editor to create, edit, and delete policies:
    If you are a project owner and a security policy project is not associated with this project,
    a security policy project is created and linked to this project when the merge request is created.
 
-## Managing projects in bulk by using a script
-
-You can use the [Vulnerability-Check Migration](https://gitlab.com/gitlab-org/gitlab/-/snippets/2328089)
-script to bulk create policies or associate security policy projects with development projects. For
-instructions and a demonstration of how to use the Vulnerability-Check Migration script, see
-<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>[Migration from Vulnerability-Check rules to Scan Result Policies with automated script](https://youtu.be/biU1N26DfBc).
-<!-- Video published on 2022-05-20 -->
-
 ## Troubleshooting
 
 When working with security policies, consider these troubleshooting tips:
diff --git a/doc/user/application_security/policies/pipeline_execution_policies.md b/doc/user/application_security/policies/pipeline_execution_policies.md
index afc3e4f9c84..cab47e66b76 100644
--- a/doc/user/application_security/policies/pipeline_execution_policies.md
+++ b/doc/user/application_security/policies/pipeline_execution_policies.md
@@ -345,12 +345,44 @@ compliance_job:
 Pipeline execution jobs are executed in isolation. Variables defined in another policy or in the project's `.gitlab-ci.yml` file are not available in the pipeline execution policy
 and cannot be overwritten from the outside.
 
-Variables can be shared with pipeline execution policies using group or project settings. If a variable is not defined in a pipeline execution policy, the value from group or project settings is applied.
-If the variable is defined in the pipeline execution policy, the group or project setting is overwritten.
-This behavior is independent from the pipeline execution policy strategy.
+Variables can be shared with pipeline execution policies using group or project settings, which follow the standard [CI/CD variable precedence](../../../ci/variables/index.md#cicd-variable-precedence) rules. However, the precedence rules are more complex when using a pipeline execution policy as they can vary depending on the pipeline execution policy strategy:
+
+- `inject_ci` strategy: If the variable is defined in the pipeline execution policy, the job always uses this value. If a variable is not defined in a pipeline execution policy, the job applies the value from the group or project settings.
+- `override_project_ci` strategy: All jobs in the resulting pipeline are treated as policy jobs. Variables defined in the policy (including those in included files) take precedence over project and group variables. This means that variables from jobs in the CI/CD configuration of the included project take precedence over the variables defined in the project and group settings.
+
+For more details on variable in pipeline execution policies, see [precedence of variable in pipeline execution policies](#precedence-of-variables-in-pipeline-execution-policies).
 
 You can [define project or group variables in the UI](../../../ci/variables/index.md#define-a-cicd-variable-in-the-ui).
 
+### Precedence of variables in pipeline execution policies
+
+When using pipeline execution policies, especially with the `override_project_ci` strategy, the precedence of variable values defined in multiple places can differ from standard GitLab CI/CD pipelines. These are some important points to understand:
+
+- When using `override_project_ci`, all jobs in the resulting pipeline are considered policy jobs, including those from the CI/CD configurations of included projects.
+- Variables defined in a policy pipeline (for the entire instance or for a job) take precedence over variables defined in the project or group settings.
+- This behavior applies to all jobs, including those included from the project's CI/CD configuration file (`.gitlab-ci.yml`).
+
+### Example
+
+If a variable in a project's CI/CD configuration and a job variable defined in an included `.gitlab-ci.yml` file have the same name, the job variable takes precedence when using `override_project_ci`.
+
+In the project's CI/CD settings, a `MY_VAR` variable is defined:
+
+- Key: `MY_VAR`
+- Value: `Project configuration variable value`
+
+In `.gitlab-ci.yml` of the included project, the same variable is defined:
+
+```yaml
+project-job:
+  variables:
+    MY_VAR: "Project job variable value"
+  script:
+    - echo $MY_VAR  # This will output "Project job variable value"
+```
+
+In this case, the job variable value `Project job variable value` takes precedence. 
+
 ## Behavior with `[skip ci]`
 
 By default, to prevent a regular pipeline from triggering, users can push a commit to a protected branch with `[skip ci]` in the commit message. However, jobs defined with a pipeline execution policy are always triggered, as the policy ignores the `[skip ci]` directive. This prevents developers from skipping the execution of jobs defined in the policy, which ensures that critical security and compliance checks are always performed.
diff --git a/doc/user/clusters/agent/ci_cd_workflow.md b/doc/user/clusters/agent/ci_cd_workflow.md
index 91131fec90a..406fec228f1 100644
--- a/doc/user/clusters/agent/ci_cd_workflow.md
+++ b/doc/user/clusters/agent/ci_cd_workflow.md
@@ -402,7 +402,7 @@ image you use in your `.gitlab-ci.yml` file, ensure this directory is writable.
 
 ### Enable TLS
 
-If you are on a self-managed GitLab instance, ensure your instance is configured with Transport Layer Security (TLS).
+If you are on GitLab Self-Managed, ensure your instance is configured with Transport Layer Security (TLS).
 
 If you attempt to use `kubectl` without TLS, you might get an error like:
 
diff --git a/doc/user/compliance/audit_events.md b/doc/user/compliance/audit_events.md
index 86eba13a365..0133cc44b4e 100644
--- a/doc/user/compliance/audit_events.md
+++ b/doc/user/compliance/audit_events.md
@@ -88,7 +88,7 @@ The time zone used for audit events depends on where you view them:
 
 - In GitLab UI, your local time zone (GitLab 15.7 and later) or UTC (GitLab 15.6 and earlier) is used.
 - The [audit events API](../../api/audit_events.md) returns dates and times in UTC by default, or the
-  [configured time zone](../../administration/timezone.md) on a self-managed GitLab instance.
+  [configured time zone](../../administration/timezone.md) on GitLab Self-Managed.
 - In CSV exports, UTC is used.
 
 ## Contribute to audit events
diff --git a/doc/user/duo_amazon_q/setup.md b/doc/user/duo_amazon_q/setup.md
index d79dca1998e..11806ca51b5 100644
--- a/doc/user/duo_amazon_q/setup.md
+++ b/doc/user/duo_amazon_q/setup.md
@@ -19,7 +19,7 @@ If you have a Duo Pro or Duo Enterprise add-on, this feature is not available.
 
 To use GitLab Duo with Amazon Q, you can [request access to a lab environment](https://about.gitlab.com/partners/technology-partners/aws/#interest).
 
-If you'd prefer to set up GitLab Duo with Amazon Q on your self-managed GitLab installation,
+If you'd prefer to set up GitLab Duo with Amazon Q on GitLab Self-Managed,
 complete the following steps.
 
 ## Set up GitLab Duo with Amazon Q
@@ -34,7 +34,7 @@ To set up GitLab Duo with Amazon Q, you must:
 
 ### Prerequisites
 
-- You must have a self-managed GitLab instance:
+- You must have GitLab Self-Managed:
   - On GitLab 17.8 or later.
   - With an HTTPS URL that can be accessed by Amazon Q (the SSL certificate must not be self-signed).
     For more details about SSL, see [Configure SSL for a Linux package installation](https://docs.gitlab.com/omnibus/settings/ssl/).
diff --git a/doc/user/gitlab_duo/prompt_guardrails.md b/doc/user/gitlab_duo/prompt_guardrails.md
new file mode 100644
index 00000000000..04575b69b30
--- /dev/null
+++ b/doc/user/gitlab_duo/prompt_guardrails.md
@@ -0,0 +1,114 @@
+---
+stage: AI-powered
+group: AI Model Validation
+description: AI-powered features and functionality.
+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 Duo prompt guardrails
+
+GitLab Duo has foundational prompt guardrails. These guardrails rely on structured prompts,
+enforced context boundaries, and filtering tools, which help:
+
+- Reduce sensitive data exposure.
+- Prevent prompt injection.
+- Guide the model towards safe and helpful responses.
+
+These safeguards support compliance with common regulatory standards,
+like GDPR, by helping to minimize risks associated with AI-driven workflows.
+
+NOTE:
+While these guardrails may reduce risks, they do not eliminate all vulnerabilities.
+No system can guarantee complete protection against all misuse or sophisticated attacks.
+
+## General guardrails
+
+The prompts used by GitLab Duo aim to:
+
+- Avoid disallowed content: The model is instructed to be informative, courteous,
+  and refrain from hateful or accusatory language.
+- Adhere strictly to user requests: The model is instructed to stick closely to the prompt and avoid role play,
+  impersonation, or deviating into unrelated content.
+- Use tags to isolate content: Tags instruct the model to focus on provided snippets,
+  helping to reduce the risk of prompt injection.
+- Filter secrets: Code suggestions are scanned to help avoid sending sensitive information inadvertently. Example: A customer's job logs containing sensitive configuration data are encapsulated in `<log>` tags, helping to ensure the model focuses only on the provided context without making unrelated assumptions.
+
+## Guardrails by job role
+
+Depending on your role, you might have different concerns about the guardrails
+set up for GitLab Duo.
+
+### For technical users
+
+- **Code isolation**: Tags like `<selected_code>`, `<git_diff>`, and `<log>`
+  encourage the model to focus strictly on the code or content you provide, helping reduce the risk of prompt injection.
+- **Secrets filtering**: Tools such as Gitleaks scan code suggestions to help prevent sensitive data,
+  like API keys or passwords, from being shared.
+- **Focused responses**: GitLab Duo focuses on the topic to help avoid behavior that could lead to unhelpful or unexpected outputs.
+- **Root Cause Analysis**: When troubleshooting, GitLab Duo aims to analyze job logs without making assumptions about anything beyond what's provided.
+
+### For auditors and compliance teams
+
+- **Regulatory alignment**: The system helps reduce risks like data leaks,
+  which helps organizations stay aligned with standards like GDPR.
+- **Transparency**: The way prompts and contexts are structured helps make
+  GitLab Duo actions predictable and available for auditing. For details, see [guardrails by feature](#guardrails-for-features).
+- **Content control**: For tasks like summarizing discussions or resolving vulnerabilities,
+  GitLab Duo uses only the inputs provided, helping to reduce the chance of errors or unintended outputs.
+- **Protection against malicious inputs**: Filters and tagging mechanisms help safeguard
+  the system from harmful or poorly formatted user content.
+
+### For decision makers
+
+- **Building confidence**: The safeguards help ensure GitLab Duo behaves responsibly,
+  which is critical for trust in new tools.
+- **Informed decisions**: Clear documentation of security features gives you the
+  information needed to assess the suitability of GitLab Duo for your organization.
+- **Reducing risks**: By working to tackle common concerns around sensitive data and model behavior,
+  GitLab Duo offers a secure, practical solution for integrating AI into your workflows.
+
+## Guardrails for features
+
+Individual features include specific prompt instructions to help limit exposure. The prompt instructions adhere to the following principles.
+
+### GitLab Duo Chat
+
+Responses should remain on-topic, constructive, and non-abusive.
+Personality shifts, role play, or malicious instructions are discouraged.
+Focusing on user-provided content helps reduce injection risk.
+
+### Discussion Summary
+
+Comments are summarized and interacting with potentially malicious content is discouraged.
+The user should be warned about suspicious comments without revealing or replicating them.
+
+### Code Explanation, Test Generation, Refactor Code, Fix Code
+
+Uses a tag to contain code and limit the model's focus, which
+helps to prevent the model from considering external, unverified instructions or content.
+
+### GitLab Duo for CLI
+
+Frames tasks as generating Git commands from natural language, helping limit scope and risk of harmful output.
+
+### Merge Request Summary
+
+Isolates the code to help prevent prompt injection.
+
+### Code Review
+
+Isolates the code to help prevent prompt injection.
+
+### Merge Commit Message Generation
+
+Uses tags to help isolate and constrain the content the model can reference.
+
+### Root Cause Analysis
+
+Uses a tag to help focus strictly on provided job logs and
+prevent assumptions beyond the given data.
+
+### Vulnerability Resolution
+
+Encourages addressing security issues without altering intended functionality.
+The model is instructed to focus on the provided code diff to help prevent changes to code.
diff --git a/doc/user/gitlab_duo_chat/index.md b/doc/user/gitlab_duo_chat/index.md
index e554a25e34f..0cea73fba44 100644
--- a/doc/user/gitlab_duo_chat/index.md
+++ b/doc/user/gitlab_duo_chat/index.md
@@ -39,6 +39,17 @@ If you have self-managed GitLab: GitLab Duo requires GitLab 17.2 and later for t
 GitLab Duo Chat is sometimes aware of the context you're working in.
 Other times, you must be more specific with your request.
 
+The context Chat is aware of also depends on your subscription tier:
+
+- In the GitLab UI:
+  - Chat is aware of code files if you have either Premium with GitLab Duo Pro, or
+    Ultimate with GitLab Duo Pro or Enterprise.
+  - For all other areas, you must have Ultimate with GitLab Duo Enterprise.
+- In the IDEs:
+  - Chat is aware of selected lines in the editor if you have either Premium with
+    GitLab Duo Pro, or Ultimate with GitLab Duo Pro or Enterprise.
+  - For all other areas, you must have Ultimate with GitLab Duo Enterprise.
+
 In the GitLab UI, GitLab Duo Chat knows about these areas:
 
 | Area           | How to ask Chat                                                                                                                                                                             |
diff --git a/doc/user/gitlab_duo_chat/turn_on_off.md b/doc/user/gitlab_duo_chat/turn_on_off.md
index 077f163ad87..780fdd8dfdb 100644
--- a/doc/user/gitlab_duo_chat/turn_on_off.md
+++ b/doc/user/gitlab_duo_chat/turn_on_off.md
@@ -42,7 +42,7 @@ In GitLab 16.11 and later, GitLab Duo Chat is:
 
 ### In earlier GitLab versions
 
-In GitLab 16.8, 16.9, and 16.10, GitLab Duo Chat is available in beta. To enable GitLab Duo Chat for your self-managed GitLab instance, an administrator must enable experiment and beta features:
+In GitLab 16.8, 16.9, and 16.10, GitLab Duo Chat is available in beta. To enable GitLab Duo Chat for GitLab Self-Managed, an administrator must enable experiment and beta features:
 
 1. On the left sidebar, at the bottom, select **Admin**.
 1. Select **Settings > General**.
diff --git a/doc/user/group/import/direct_transfer_migrations.md b/doc/user/group/import/direct_transfer_migrations.md
index b676bb61d61..5f7012a0147 100644
--- a/doc/user/group/import/direct_transfer_migrations.md
+++ b/doc/user/group/import/direct_transfer_migrations.md
@@ -111,7 +111,7 @@ There is a [known issue](index.md#known-issues) affecting the mapping of shared
 To ensure GitLab maps users and their contributions correctly between the source and destination instances:
 
 1. Create the required users on the destination GitLab instance. You can create users with the API only on self-managed instances because it requires
-   administrator access. When migrating to GitLab.com or a self-managed GitLab instance you can:
+   administrator access. When migrating to GitLab.com or GitLab Self-Managed you can:
    - Create users manually.
    - Set up or use your existing [SAML SSO provider](../saml_sso/index.md) and leverage user synchronization of SAML SSO groups supported through
      [SCIM](../../group/saml_sso/scim_setup.md). You can
diff --git a/doc/user/group/saml_sso/group_sync.md b/doc/user/group/saml_sso/group_sync.md
index 2e6e0392247..d0d194d8458 100644
--- a/doc/user/group/saml_sso/group_sync.md
+++ b/doc/user/group/saml_sso/group_sync.md
@@ -292,7 +292,7 @@ When global group memberships lock is enabled:
 
 To enable global group memberships lock:
 
-1. [Configure SAML](../../../integration/saml.md) for your self-managed GitLab instance.
+1. [Configure SAML](../../../integration/saml.md) for GitLab Self-Managed.
 1. On the left sidebar, at the bottom, select **Admin**.
 1. Select **Settings > General**.
 1. Expand the **Visibility and access controls** section.
diff --git a/doc/user/group/saml_sso/troubleshooting_scim.md b/doc/user/group/saml_sso/troubleshooting_scim.md
index 48a89c14563..3c37c885ddf 100644
--- a/doc/user/group/saml_sso/troubleshooting_scim.md
+++ b/doc/user/group/saml_sso/troubleshooting_scim.md
@@ -32,7 +32,7 @@ To solve this problem, the user must [link SAML to their existing GitLab.com acc
 
 ### Self-managed GitLab
 
-For a self-managed GitLab instance, administrators of that instance can instead [add the user identity themselves](../../../administration/admin_area.md#user-identities). This might save time if administrators need to re-add multiple identities.
+For GitLab Self-Managed, administrators of that instance can instead [add the user identity themselves](../../../administration/admin_area.md#user-identities). This might save time if administrators need to re-add multiple identities.
 
 ## User cannot sign in
 
diff --git a/doc/user/packages/terraform_module_registry/index.md b/doc/user/packages/terraform_module_registry/index.md
index 39c8d4703a1..584887d2668 100644
--- a/doc/user/packages/terraform_module_registry/index.md
+++ b/doc/user/packages/terraform_module_registry/index.md
@@ -212,7 +212,7 @@ credentials "gitlab.com" {
 }
 ```
 
-Where `gitlab.com` can be replaced with the hostname of your self-managed GitLab instance.
+Where `gitlab.com` can be replaced with the hostname of GitLab Self-Managed.
 
 You can then refer to your Terraform module from a downstream Terraform project:
 
@@ -236,7 +236,7 @@ login <USERNAME>
 password <TOKEN>
 ```
 
-Where `gitlab.com` can be replaced with the hostname of your self-managed GitLab instance, and `<USERNAME>` is your token username.
+Where `gitlab.com` can be replaced with the hostname of GitLab Self-Managed, and `<USERNAME>` is your token username.
 
 You can refer to your Terraform module from a downstream Terraform project:
 
diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md
index 273199ed2d0..1c27389bea7 100644
--- a/doc/user/project/clusters/add_eks_clusters.md
+++ b/doc/user/project/clusters/add_eks_clusters.md
@@ -226,7 +226,7 @@ DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** Self-managed, GitLab Dedicated
 
-If you are using a self-managed GitLab instance, you need to configure
+If you are using GitLab Self-Managed, you need to configure
 Amazon credentials. GitLab uses these credentials to assume an Amazon IAM role to create your cluster.
 
 Create an IAM user and ensure it has permissions to assume the roles that
diff --git a/doc/user/project/import/fogbugz.md b/doc/user/project/import/fogbugz.md
index 07e53d04c96..fd2689ae2c1 100644
--- a/doc/user/project/import/fogbugz.md
+++ b/doc/user/project/import/fogbugz.md
@@ -13,7 +13,7 @@ DETAILS:
 > - Ability to re-import projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23905) in GitLab 15.9.
 
 Using the importer, you can import your FogBugz project to GitLab.com
-or to your self-managed GitLab instance.
+or to GitLab Self-Managed.
 
 The importer imports all of your cases and comments with the original
 case numbers and timestamps. You can also map FogBugz users to GitLab
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 9bbccd15819..f27acc73f20 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -310,7 +310,7 @@ Increasing the number of Sidekiq workers does *not* reduce the time spent clonin
 
 ### Enable GitHub OAuth using a GitHub Enterprise Cloud OAuth App
 
-If you belong to a [GitHub Enterprise Cloud organization](https://docs.github.com/en/enterprise-cloud@latest/get-started/onboarding) you can configure your self-managed GitLab instance to obtain a higher [GitHub API rate limit](https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#primary-rate-limit-for-authenticated-users).
+If you belong to a [GitHub Enterprise Cloud organization](https://docs.github.com/en/enterprise-cloud@latest/get-started/onboarding) you can configure GitLab Self-Managed to obtain a higher [GitHub API rate limit](https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#primary-rate-limit-for-authenticated-users).
 
 GitHub API requests are usually subject to a rate limit of 5,000 requests per hour. Using the steps below, you obtain a higher 15,000 requests per hour rate limit, resulting in a faster overall import time.
 
diff --git a/doc/user/project/import/gitlab_com.md b/doc/user/project/import/gitlab_com.md
index 8d71107f2ea..34eb25bba97 100644
--- a/doc/user/project/import/gitlab_com.md
+++ b/doc/user/project/import/gitlab_com.md
@@ -6,7 +6,7 @@ remove_date: '2025-01-25'
 redirect_to: '../../group/import/index.md'
 ---
 
-# Import a project from GitLab.com to your self-managed GitLab instance (removed)
+# Import a project from GitLab.com to GitLab Self-Managed (removed)
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
diff --git a/doc/user/project/import/jira.md b/doc/user/project/import/jira.md
index a660db04bdc..73984cb1cf0 100644
--- a/doc/user/project/import/jira.md
+++ b/doc/user/project/import/jira.md
@@ -11,7 +11,7 @@ DETAILS:
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
 Using GitLab Jira importer, you can import your Jira issues to GitLab.com or to
-your self-managed GitLab instance.
+GitLab Self-Managed.
 
 Jira issues import is an MVC, project-level feature, meaning that issues from multiple
 Jira projects can be imported into a GitLab project. MVC version imports issue title and description
diff --git a/doc/user/project/merge_requests/reviews/img/remove_v17_8.png b/doc/user/project/merge_requests/reviews/img/remove_v17_8.png
new file mode 100644
index 00000000000..d67780d4a84
Binary files /dev/null and b/doc/user/project/merge_requests/reviews/img/remove_v17_8.png differ
diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md
index 513e20bfa38..2247f657ccd 100644
--- a/doc/user/project/merge_requests/reviews/index.md
+++ b/doc/user/project/merge_requests/reviews/index.md
@@ -187,6 +187,26 @@ When this happens, the merge request reports area shows the message
 **The change requests must be completed or resolved.** To unblock the merge request,
 the reviewer who requested changes should [re-review and approve](#re-request-a-review) the merge request.
 
+### Remove a change request
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/480412) in GitLab 17.8.
+
+If you previously requested changes, you can remove your change request. You might need to do this
+if both of the following are true:
+
+- You can no longer approve the merge request.
+- You want to cancel your change request, but don't want to submit a new review.
+
+To remove your change request without submitting a new review:
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Code > Merge requests** and find your merge request.
+1. Select the title of the merge request to view it.
+1. On the merge request **Overview**, scroll to the merge request reports area.
+1. Next to **The change requests must be completed or resolved**, select **Remove**:
+
+   ![A merge request that is blocked because a user requested changes](img/remove_v17_8.png)
+
 ### Bypass a request for changes
 
 If the user who requested changes is unavailable to re-review or approve,
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index a2891cfa170..c568cc3460a 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -104,7 +104,7 @@ For example:
 DETAILS:
 **Offering:** Self-managed, GitLab Dedicated
 
-Before you can migrate projects on a self-managed GitLab instance using file exports, GitLab administrators must:
+Before you can migrate projects on GitLab Self-Managed using file exports, GitLab administrators must:
 
 1. [Enable file exports](../../../administration/settings/import_and_export_settings.md#enable-project-export) on the source
    instance.
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index dd015d2433e..4490f74a7b4 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -283,4 +283,4 @@ creating a new snippet, use this workaround:
 
 ## Related topics
 
-- [Configure snippet settings](../administration/snippets/index.md) on a self-managed GitLab instance
+- [Configure snippet settings](../administration/snippets/index.md) on GitLab Self-Managed
diff --git a/lib/gitlab/bitbucket_server_import/user_finder.rb b/lib/gitlab/bitbucket_server_import/user_finder.rb
index d40d6bd6af6..61bb5efecb3 100644
--- a/lib/gitlab/bitbucket_server_import/user_finder.rb
+++ b/lib/gitlab/bitbucket_server_import/user_finder.rb
@@ -25,6 +25,8 @@ module Gitlab
         # We want this to only match either placeholder or email
         # depending on the flag state. There should be no fall-through.
         if user_mapping_enabled?(project)
+          return unless object[:username]
+
           source_user_for_author(object).mapped_user_id
         else
           find_user_id(by: :email, value: object.is_a?(Hash) ? object[:author_email] : object.author_email)
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 80ce47c2260..759618bbc2d 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -901,13 +901,11 @@ module Gitlab
       # no_tags - should we use --no-tags flag?
       # prune - should we use --prune flag?
       # check_tags_changed - should we ask gitaly to calculate whether any tags changed?
-      # check_repo_changed - should we ask gitaly to calculate if the repo has changed?
       # resolved_address - resolved IP address for provided URL
-      # lfs_sync_before_branch_updates - passed in lfs_sync_before_branch_updates FF
       def fetch_remote( # rubocop:disable Metrics/ParameterLists
         url,
         refmap: nil, ssh_auth: nil, forced: false, no_tags: false, prune: true,
-        check_tags_changed: false, check_repo_changed: false, http_authorization_header: "", resolved_address: "", lfs_sync_before_branch_updates: false)
+        check_tags_changed: false, http_authorization_header: "", resolved_address: "")
         wrapped_gitaly_errors do
           gitaly_repository_client.fetch_remote(
             url,
@@ -917,8 +915,6 @@ module Gitlab
             no_tags: no_tags,
             prune: prune,
             check_tags_changed: check_tags_changed,
-            lfs_sync_before_branch_updates: lfs_sync_before_branch_updates,
-            check_repo_changed: check_repo_changed,
             timeout: GITLAB_PROJECTS_TIMEOUT,
             http_authorization_header: http_authorization_header,
             resolved_address: resolved_address
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 7412a7ff971..0725ef371a8 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -77,7 +77,7 @@ module Gitlab
       # rubocop: disable Metrics/ParameterLists
       # The `remote` parameter is going away soonish anyway, at which point the
       # Rubocop warning can be enabled again.
-      def fetch_remote(url, refmap:, ssh_auth:, forced:, no_tags:, timeout:, prune: true, check_tags_changed: false, check_repo_changed: false, http_authorization_header: "", resolved_address: "", lfs_sync_before_branch_updates: false)
+      def fetch_remote(url, refmap:, ssh_auth:, forced:, no_tags:, timeout:, prune: true, check_tags_changed: false, http_authorization_header: "", resolved_address: "")
         request = Gitaly::FetchRemoteRequest.new(
           repository: @gitaly_repo,
           force: forced,
@@ -93,8 +93,6 @@ module Gitlab
           )
         )
 
-        request.check_repo_changed = check_repo_changed if lfs_sync_before_branch_updates && request.respond_to?(:check_repo_changed)
-
         if ssh_auth&.ssh_mirror_url?
           if ssh_auth.ssh_key_auth? && ssh_auth.ssh_private_key.present?
             request.ssh_key = ssh_auth.ssh_private_key
diff --git a/lib/gitlab/sidekiq_middleware/skip_jobs.rb b/lib/gitlab/sidekiq_middleware/skip_jobs.rb
index 942834357aa..994d90d498a 100644
--- a/lib/gitlab/sidekiq_middleware/skip_jobs.rb
+++ b/lib/gitlab/sidekiq_middleware/skip_jobs.rb
@@ -113,7 +113,12 @@ module Gitlab
 
       def drop_job!(job, worker)
         job['dropped'] = true
-        @metrics.fetch(COUNTER).increment({ worker: worker.class.name, action: "dropped" })
+        @metrics.fetch(COUNTER).increment({
+          worker: worker.class.name,
+          action: "dropped",
+          reason: "feature_flag",
+          feature_category: worker.class.get_feature_category.to_s
+        })
       end
 
       def defer_job!(job, worker)
@@ -124,7 +129,12 @@ module Gitlab
         job['deferred_count'] += 1
 
         worker.class.deferred(job['deferred_count'], @deferred_by).perform_in(@delay, *job['args'])
-        @metrics.fetch(COUNTER).increment({ worker: worker.class.name, action: "deferred" })
+        @metrics.fetch(COUNTER).increment({
+          worker: worker.class.name,
+          action: "deferred",
+          reason: @deferred_by.to_s,
+          feature_category: worker.class.get_feature_category.to_s
+        })
       end
 
       def init_metrics
diff --git a/lib/import/placeholder_references/pusher.rb b/lib/import/placeholder_references/pusher.rb
index e1f428e5f18..96847f5a33d 100644
--- a/lib/import/placeholder_references/pusher.rb
+++ b/lib/import/placeholder_references/pusher.rb
@@ -5,6 +5,7 @@ module Import
     module Pusher
       def push_reference(project, record, attribute, source_user_identifier)
         return unless user_mapping_enabled?(project)
+        return if source_user_identifier.nil?
 
         source_user = source_user_mapper(project).find_source_user(source_user_identifier)
 
diff --git a/package.json b/package.json
index 4efef20cada..6a1039c6110 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/query-language-rust": "0.3.2",
     "@gitlab/svgs": "3.121.0",
-    "@gitlab/ui": "106.1.0",
+    "@gitlab/ui": "106.2.0",
     "@gitlab/vue-router-vue3": "npm:vue-router@4.1.6",
     "@gitlab/vuex-vue3": "npm:vuex@4.0.0",
     "@gitlab/web-ide": "^0.0.1-dev-20250109203134",
diff --git a/spec/frontend/diffs/components/tree_list_spec.js b/spec/frontend/diffs/components/tree_list_spec.js
index 85c3e38b1e2..2309d34384f 100644
--- a/spec/frontend/diffs/components/tree_list_spec.js
+++ b/spec/frontend/diffs/components/tree_list_spec.js
@@ -67,6 +67,7 @@ describe('Diffs tree list component', () => {
           mutations: { ...mutations },
           actions: {
             toggleTreeOpen: actions.toggleTreeOpen,
+            setTreeOpen: actions.setTreeOpen,
             goToFile: actions.goToFile,
             setRenderTreeList: setRenderTreeListMock,
           },
@@ -85,6 +86,31 @@ describe('Diffs tree list component', () => {
         tree: [],
         opened: true,
       },
+      javascript: {
+        key: 'appjavascript',
+        path: 'app/javascript',
+        name: 'javascript',
+        type: 'tree',
+        tree: [
+          {
+            addedLines: 0,
+            changed: true,
+            deleted: false,
+            fileHash: 'appjavascriptfile',
+            key: 'file.js',
+            name: 'file.js',
+            path: 'app/javascript/file.rb',
+            removedLines: 0,
+            tempFile: true,
+            type: 'blob',
+            parentPath: 'app/javascript',
+            tree: [],
+            file_path: 'app/javascript/file.js',
+            file_hash: 'appjavascriptfile',
+          },
+        ],
+        opened: true,
+      },
       'index.js': {
         addedLines: 0,
         changed: true,
@@ -105,7 +131,7 @@ describe('Diffs tree list component', () => {
         addedLines: 0,
         changed: true,
         deleted: false,
-        fileHash: 'test',
+        fileHash: 'apptest',
         key: 'test.rb',
         name: 'test.rb',
         path: 'app/test.rb',
@@ -141,7 +167,7 @@ describe('Diffs tree list component', () => {
         treeEntries.LICENSE,
         {
           ...treeEntries.app,
-          tree: [treeEntries['index.js'], treeEntries['test.rb']],
+          tree: [treeEntries.javascript, treeEntries['index.js'], treeEntries['test.rb']],
         },
       ],
     });
@@ -201,7 +227,7 @@ describe('Diffs tree list component', () => {
     });
 
     it('renders tree', () => {
-      expect(getScroller().props('items')).toHaveLength(4);
+      expect(getScroller().props('items')).toHaveLength(6);
     });
 
     it('hides file stats', () => {
@@ -223,6 +249,23 @@ describe('Diffs tree list component', () => {
       await nextTick();
       expect(getScroller().props('items')).toHaveLength(5);
     });
+
+    it('dispatches setTreeOpen with all paths for the current diff file', async () => {
+      jest.spyOn(store, 'dispatch').mockReturnValue(undefined);
+
+      store.state.diffs.currentDiffFileId = 'appjavascriptfile';
+
+      await nextTick();
+
+      expect(store.dispatch).toHaveBeenCalledWith('diffs/setTreeOpen', {
+        opened: true,
+        path: 'app',
+      });
+      expect(store.dispatch).toHaveBeenCalledWith('diffs/setTreeOpen', {
+        opened: true,
+        path: 'app/javascript',
+      });
+    });
   });
 
   describe('with viewedDiffFileIds', () => {
diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js
index f713e8b306d..fab41854860 100644
--- a/spec/frontend/diffs/store/actions_spec.js
+++ b/spec/frontend/diffs/store/actions_spec.js
@@ -1290,6 +1290,18 @@ describe('DiffsStoreActions', () => {
     });
   });
 
+  describe('setTreeOpen', () => {
+    it('commits SET_FOLDER_OPEN', () => {
+      return testAction(
+        diffActions.setTreeOpen,
+        { path: 'path', opened: true },
+        {},
+        [{ type: types.SET_FOLDER_OPEN, payload: { path: 'path', opened: true } }],
+        [],
+      );
+    });
+  });
+
   describe('goToFile', () => {
     const getters = {};
     const file = { path: 'path' };
diff --git a/spec/frontend/diffs/store/mutations_spec.js b/spec/frontend/diffs/store/mutations_spec.js
index 722d54bdc41..a10979aacaf 100644
--- a/spec/frontend/diffs/store/mutations_spec.js
+++ b/spec/frontend/diffs/store/mutations_spec.js
@@ -948,6 +948,22 @@ describe('DiffsStoreMutations', () => {
     });
   });
 
+  describe('SET_FOLDER_OPEN', () => {
+    it('toggles entry opened prop', () => {
+      const state = {
+        treeEntries: {
+          path: {
+            opened: false,
+          },
+        },
+      };
+
+      mutations[types.SET_FOLDER_OPEN](state, { path: 'path', opened: true });
+
+      expect(state.treeEntries.path.opened).toBe(true);
+    });
+  });
+
   describe('TREE_ENTRY_DIFF_LOADING', () => {
     it('sets the entry loading state to true by default', () => {
       const state = {
diff --git a/spec/frontend/diffs/stores/legacy_diffs/actions_spec.js b/spec/frontend/diffs/stores/legacy_diffs/actions_spec.js
index 259b569848e..82913553f39 100644
--- a/spec/frontend/diffs/stores/legacy_diffs/actions_spec.js
+++ b/spec/frontend/diffs/stores/legacy_diffs/actions_spec.js
@@ -1333,6 +1333,18 @@ describe('legacyDiffs actions', () => {
     });
   });
 
+  describe('setTreeOpen', () => {
+    it('commits SET_FOLDER_OPEN', () => {
+      return testAction(
+        store.setTreeOpen,
+        { path: 'path', opened: true },
+        { treeEntries: { path: {} } },
+        [{ type: store[types.SET_FOLDER_OPEN], payload: { path: 'path', opened: true } }],
+        [],
+      );
+    });
+  });
+
   describe('goToFile', () => {
     const file = { path: 'path' };
     const fileHash = 'test';
diff --git a/spec/frontend/diffs/stores/legacy_diffs/mutations_spec.js b/spec/frontend/diffs/stores/legacy_diffs/mutations_spec.js
index 929d44a4581..2c14bb43a50 100644
--- a/spec/frontend/diffs/stores/legacy_diffs/mutations_spec.js
+++ b/spec/frontend/diffs/stores/legacy_diffs/mutations_spec.js
@@ -936,6 +936,22 @@ describe('DiffsStoreMutations', () => {
     });
   });
 
+  describe('SET_FOLDER_OPEN', () => {
+    it('toggles entry opened prop', () => {
+      store.$patch({
+        treeEntries: {
+          path: {
+            opened: false,
+          },
+        },
+      });
+
+      store[types.SET_FOLDER_OPEN]({ path: 'path', opened: true });
+
+      expect(store.treeEntries.path.opened).toBe(true);
+    });
+  });
+
   describe('TREE_ENTRY_DIFF_LOADING', () => {
     it('sets the entry loading state to true by default', () => {
       store.$patch({
diff --git a/spec/frontend/merge_request_dashboard/components/collapsible_section_spec.js b/spec/frontend/merge_request_dashboard/components/collapsible_section_spec.js
index 13ff14fafae..5781cf72a38 100644
--- a/spec/frontend/merge_request_dashboard/components/collapsible_section_spec.js
+++ b/spec/frontend/merge_request_dashboard/components/collapsible_section_spec.js
@@ -24,6 +24,9 @@ describe('Merge request dashboard collapsible section', () => {
       stubs: {
         CrudComponent,
       },
+      provide: {
+        newListsEnabled: false,
+      },
     });
   }
 
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb
index 25933b56d14..0c1a4000b28 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb
@@ -88,6 +88,26 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Appro
       importer.execute(approved_event)
     end
 
+    context 'when approved event has no associated approver' do
+      let(:approved_event) { super().merge(approver_username: nil) }
+
+      it 'does not set an approver' do
+        expect_log(
+          stage: 'import_approved_event',
+          message: 'skipped due to missing user',
+          iid: merge_request.iid,
+          event_id: 4
+        )
+
+        expect { importer.execute(approved_event) }
+          .to not_change { merge_request.approvals.count }
+          .and not_change { merge_request.notes.count }
+          .and not_change { merge_request.reviewers.count }
+
+        expect(merge_request.approvals).to be_empty
+      end
+    end
+
     context 'when user contribution mapping is disabled' do
       let_it_be(:pull_request_author) do
         create(:user, username: 'pull_request_author', email: 'pull_request_author@example.org')
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/declined_event_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/declined_event_spec.rb
index f486f02b4fe..0c64d3fd61d 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/declined_event_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/declined_event_spec.rb
@@ -65,6 +65,25 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Decli
       importer.execute(declined_event)
     end
 
+    context 'when declined event has no associated user' do
+      let(:declined_event) { super().merge(decliner_username: nil) }
+
+      it 'does not set a decliner' do
+        expect_log(
+          stage: 'import_declined_event',
+          message: 'skipped due to missing user',
+          iid: merge_request.iid,
+          event_id: 7
+        )
+
+        expect { importer.execute(declined_event) }
+          .to not_change { merge_request.events.count }
+          .and not_change { merge_request.resource_state_events.count }
+
+        expect(merge_request.metrics.reload.latest_closed_by).to be_nil
+      end
+    end
+
     context 'when user contribution mapping is disabled' do
       let_it_be(:decliner_author) { create(:user, username: 'decliner_author', email: 'decliner_author@example.org') }
 
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/inline_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/inline_spec.rb
index 89a2b045682..09d95a92678 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/inline_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/inline_spec.rb
@@ -44,6 +44,8 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Inlin
   let_it_be(:reply_source_user) { generate_source_user(project, reply[:author_username]) }
   let_it_be(:note_source_user) { generate_source_user(project, pr_inline_comment[:author_username]) }
 
+  let(:cached_references) { placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id) }
+
   def expect_log(stage:, message:, iid:, comment_id:)
     allow(Gitlab::BitbucketServerImport::Logger).to receive(:info).and_call_original
     expect(Gitlab::BitbucketServerImport::Logger)
@@ -56,7 +58,6 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Inlin
     it 'pushes placeholder references' do
       importer.execute(pr_inline_comment)
 
-      cached_references = placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id)
       expect(cached_references).to contain_exactly(
         ['DiffNote', instance_of(Integer), 'author_id', note_source_user.id],
         ['DiffNote', instance_of(Integer), 'author_id', reply_source_user.id]
@@ -94,6 +95,27 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Inlin
       importer.execute(pr_inline_comment)
     end
 
+    context 'when one of the comments has no associated author' do
+      let(:pr_inline_comment) { super().merge(author_username: nil) }
+
+      it 'creates the comment without an author' do
+        expect { importer.execute(pr_inline_comment) }.to change { Note.count }.by(2)
+
+        start_note, reply_note = merge_request.notes.order(:id).to_a
+
+        expect(start_note.author_id).to eq(project.creator_id)
+        expect(reply_note.author_id).to eq(reply_source_user.mapped_user_id)
+      end
+
+      it 'does not push placeholder references for that comment' do
+        importer.execute(pr_inline_comment)
+
+        expect(cached_references).to contain_exactly(
+          ['DiffNote', instance_of(Integer), 'author_id', reply_source_user.id]
+        )
+      end
+    end
+
     context 'when note has @ username mentions' do
       let(:original_text) { "Attention: @ali has worked on this. @fred's work from @.ali-ce/group#9?" }
       let(:expected_text) { "Attention: `@ali` has worked on this. `@fred`'s work from `@.ali-ce/group#9`?" }
@@ -198,7 +220,6 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Inlin
       it 'does not push placeholder references' do
         importer.execute(pr_inline_comment)
 
-        cached_references = placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id)
         expect(cached_references).to be_empty
       end
     end
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/merge_event_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/merge_event_spec.rb
index ef3bc4146a2..edb2c04b233 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/merge_event_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/merge_event_spec.rb
@@ -5,7 +5,10 @@ require 'spec_helper'
 RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::MergeEvent, feature_category: :importers do
   include Import::UserMappingHelper
 
-  let_it_be(:project) { create(:project, :repository, :bitbucket_server_import, :import_user_mapping_enabled) }
+  let_it_be_with_reload(:project) do
+    create(:project, :repository, :bitbucket_server_import, :import_user_mapping_enabled)
+  end
+
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
   let_it_be(:now) { Time.now.utc.change(usec: 0) }
   let_it_be(:merge_event) do
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/standalone_notes_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/standalone_notes_spec.rb
index 57421fab9ab..b9e18f756c0 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/standalone_notes_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/standalone_notes_spec.rb
@@ -5,7 +5,10 @@ require 'spec_helper'
 RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::StandaloneNotes, feature_category: :importers do
   include Import::UserMappingHelper
 
-  let_it_be(:project) { create(:project, :repository, :bitbucket_server_import, :import_user_mapping_enabled) }
+  let_it_be_with_reload(:project) do
+    create(:project, :repository, :bitbucket_server_import, :import_user_mapping_enabled)
+  end
+
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
   let_it_be(:now) { Time.now.utc.change(usec: 0) }
   let_it_be(:author_details) do
@@ -29,6 +32,8 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Stand
 
   let_it_be(:source_user) { generate_source_user(project, pr_comment[:author_username]) }
 
+  let(:cached_references) { placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id) }
+
   def expect_log(stage:, message:, iid:, comment_id:)
     allow(Gitlab::BitbucketServerImport::Logger).to receive(:info).and_call_original
     expect(Gitlab::BitbucketServerImport::Logger)
@@ -41,7 +46,6 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Stand
     it 'pushes placeholder reference' do
       importer.execute(pr_comment)
 
-      cached_references = placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id)
       expect(cached_references).to contain_exactly(
         ['Note', instance_of(Integer), 'author_id', source_user.id]
       )
@@ -104,6 +108,27 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Stand
           imported_from: 'bitbucket_server'
         )
       end
+
+      context 'when one of the comments has no associated author' do
+        let(:pr_comment) { super().merge(author_username: nil) }
+
+        it 'creates the comment without an author' do
+          expect { importer.execute(pr_comment) }.to change { Note.count }.by(2)
+
+          start_note, reply_note = merge_request.notes.order(:id).to_a
+
+          expect(start_note.author_id).to eq(project.creator_id)
+          expect(reply_note.author_id).to eq(source_user.mapped_user_id)
+        end
+
+        it 'does not push placeholder references for that comment' do
+          importer.execute(pr_comment)
+
+          expect(cached_references).to contain_exactly(
+            ['Note', instance_of(Integer), 'author_id', source_user.id]
+          )
+        end
+      end
     end
 
     context 'when note has @ username mentions' do
@@ -208,7 +233,6 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Stand
       it 'does not push placeholder references' do
         importer.execute(pr_comment)
 
-        cached_references = placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id)
         expect(cached_references).to be_empty
       end
 
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer_spec.rb
index c89fc2ad1a2..eb0fb1c80e4 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer_spec.rb
@@ -359,6 +359,25 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotesImporte
           )
         end
 
+        context 'when comment has no associated author' do
+          before do
+            allow(pr_inline_note).to receive(:author_username).and_return(nil)
+            allow(reply).to receive(:author_username).and_return(nil)
+          end
+
+          it 'attributes the comments to the project creator' do
+            importer.execute
+
+            expect(merge_request.notes.collect(&:author_id)).to match_array([project.creator_id, project.creator_id])
+          end
+
+          it 'does not push placeholder references' do
+            importer.execute
+
+            expect(cached_references).to be_empty
+          end
+        end
+
         context 'when a diff note is invalid' do
           let(:pr_inline_note) do
             instance_double(
@@ -438,6 +457,26 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotesImporte
             ["MergeRequest::Metrics", instance_of(Integer), "merged_by_id", author_source_user.id]
           )
         end
+
+        context 'when merge event has no associated user' do
+          before do
+            allow(merge_event).to receive(:committer_username).and_return(nil)
+          end
+
+          it 'associates the merge event with project creator' do
+            importer.execute
+
+            merge_request.reload
+
+            expect(merge_request.metrics.merged_by_id).to eq(project.creator_id)
+          end
+
+          it 'does not push placeholder references' do
+            importer.execute
+
+            expect(cached_references).to be_empty
+          end
+        end
       end
 
       context 'when PR has an approved event' do
@@ -488,6 +527,21 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotesImporte
             expect { importer.execute }.not_to change { merge_request.reviewers.count }
           end
         end
+
+        context 'when approved event has no associated approver' do
+          before do
+            allow(approved_event).to receive(:approver_username).and_return(nil)
+          end
+
+          it 'does not set an approver' do
+            expect { importer.execute }
+              .to not_change { merge_request.approvals.count }
+              .and not_change { merge_request.notes.count }
+              .and not_change { merge_request.reviewers.count }
+
+            expect(merge_request.approvals).to be_empty
+          end
+        end
       end
     end
 
diff --git a/spec/lib/gitlab/bitbucket_server_import/user_finder_spec.rb b/spec/lib/gitlab/bitbucket_server_import/user_finder_spec.rb
index 12bfc8925dd..afdfcb22b77 100644
--- a/spec/lib/gitlab/bitbucket_server_import/user_finder_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/user_finder_spec.rb
@@ -45,6 +45,14 @@ RSpec.describe Gitlab::BitbucketServerImport::UserFinder, :clean_gitlab_redis_sh
 
       expect(user_id).to eq(source_user.mapped_user.id)
     end
+
+    it 'returns nil when username is nil' do
+      user_representation[:username] = nil
+
+      user_id = user_finder.uid(user_representation)
+
+      expect(user_id).to be_nil
+    end
   end
 
   context 'when user contribution mapping is disabled' do
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index adbe9ee14d8..f04384e793a 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -671,17 +671,15 @@ RSpec.describe Gitlab::Git::Repository, feature_category: :source_code_managemen
         no_tags: true,
         timeout: described_class::GITLAB_PROJECTS_TIMEOUT,
         prune: false,
-        check_repo_changed: false,
         check_tags_changed: false,
         refmap: nil,
         http_authorization_header: "",
-        lfs_sync_before_branch_updates: false,
         resolved_address: '172.16.123.1'
       }
 
       expect(repository.gitaly_repository_client).to receive(:fetch_remote).with(url, expected_opts)
 
-      repository.fetch_remote(url, ssh_auth: ssh_auth, forced: true, no_tags: true, prune: false, check_repo_changed: false, check_tags_changed: false, lfs_sync_before_branch_updates: false, resolved_address: '172.16.123.1')
+      repository.fetch_remote(url, ssh_auth: ssh_auth, forced: true, no_tags: true, prune: false, check_tags_changed: false, resolved_address: '172.16.123.1')
     end
 
     it_behaves_like 'wrapping gRPC errors', Gitlab::GitalyClient::RepositoryService, :fetch_remote do
diff --git a/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb b/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb
index 0383791b825..01f1e0db913 100644
--- a/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb
@@ -12,6 +12,8 @@ RSpec.describe Gitlab::SidekiqMiddleware::SkipJobs, feature_category: :scalabili
         'TestWorker'
       end
       include ApplicationWorker
+
+      feature_category :scalability
     end
   end
 
@@ -60,7 +62,12 @@ RSpec.describe Gitlab::SidekiqMiddleware::SkipJobs, feature_category: :scalabili
         end
 
         it 'increments counter' do
-          expect(metric).to receive(:increment).with({ worker: "TestWorker", action: "dropped" })
+          expect(metric).to receive(:increment).with({
+            worker: "TestWorker",
+            action: "dropped",
+            reason: "feature_flag",
+            feature_category: "scalability"
+          })
 
           subject.call(TestWorker.new, job, queue) { nil }
         end
@@ -91,7 +98,12 @@ RSpec.describe Gitlab::SidekiqMiddleware::SkipJobs, feature_category: :scalabili
         end
 
         it 'increments counter' do
-          expect(metric).to receive(:increment).with({ worker: "TestWorker", action: "deferred" })
+          expect(metric).to receive(:increment).with({
+            worker: "TestWorker",
+            action: "deferred",
+            reason: "feature_flag",
+            feature_category: "scalability"
+          })
 
           subject.call(TestWorker.new, job, queue) { nil }
         end
@@ -186,9 +198,13 @@ RSpec.describe Gitlab::SidekiqMiddleware::SkipJobs, feature_category: :scalabili
       end
 
       context 'with stop signal from database health check' do
+        let(:metric) { instance_double(Prometheus::Client::Counter, increment: true) }
+
         before do
           stop_signal = instance_double("Gitlab::Database::HealthStatus::Signals::Stop", stop?: true)
           allow(Gitlab::Database::HealthStatus).to receive(:evaluate).and_return([stop_signal])
+          allow(Gitlab::Metrics).to receive(:counter).and_call_original
+          allow(Gitlab::Metrics).to receive(:counter).with(described_class::COUNTER, anything).and_return(metric)
         end
 
         it 'defers the job by set time' do
@@ -197,6 +213,19 @@ RSpec.describe Gitlab::SidekiqMiddleware::SkipJobs, feature_category: :scalabili
 
           TestWorker.perform_async(*job['args'])
         end
+
+        it 'increments counter' do
+          expect(TestWorker).to receive(:deferred).with(1, :database_health_check).and_return(setter)
+          expect(setter).to receive(:perform_in).with(health_signal_attrs[:delay], *job['args'])
+          expect(metric).to receive(:increment).with({
+            worker: "TestWorker",
+            action: "deferred",
+            reason: "database_health_check",
+            feature_category: "scalability"
+          })
+
+          TestWorker.perform_async(*job['args'])
+        end
       end
 
       context 'when a block is provided' do
diff --git a/yarn.lock b/yarn.lock
index 6617299e853..c7fe2fa416a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1433,10 +1433,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.121.0.tgz#57cacc895929aef4320632396373797a64b230ff"
   integrity sha512-ZekVjdMZrjrNEjdrOHsJYCu7A+ea3AkuNUxWIZ3FaNgJj4Oh21RlTP7bQKnRSXVhBbV1jg1PgzQ1ANEoCW8t4g==
 
-"@gitlab/ui@106.1.0":
-  version "106.1.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-106.1.0.tgz#a6d358e39aef1bf198746415cf931bff3d579f34"
-  integrity sha512-vS2aKTTA9bXZ+BbV5i5kCraEX4LbsZWjtIOvSXaX3OF7F/NBJtIIRXIZ9MNlHycy7MByPMQgF+YcoH+dg59Y7A==
+"@gitlab/ui@106.2.0":
+  version "106.2.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-106.2.0.tgz#d69f4d886c30703dde593a699a882d8e4b0df3eb"
+  integrity sha512-Kpl5TWEIaQXFaoFZTyw8HaeQLgeohaWAinTPHOIr5zPB8J4TryAuGe92jg5LxoJ6/iNRBHhfZ5dYs25TSoiYlg==
   dependencies:
     "@floating-ui/dom" "1.4.3"
     echarts "^5.3.2"