From 7a4582e96762f0a582cfbbd2cf085846fa96f1d3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 22 Mar 2024 03:10:05 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../release-environments/main.gitlab-ci.yml   |   2 +-
 GITALY_SERVER_VERSION                         |   2 +-
 Gemfile                                       |   6 +-
 Gemfile.checksum                              |   5 +-
 Gemfile.lock                                  |  12 +-
 .../cycle_analytics/components/filter_bar.vue |   2 +-
 .../javascripts/batch_comments/index.js       |   2 +-
 .../issue_board_filtered_search.vue           |   2 +-
 .../components/details/ci_resource_header.vue | 138 ++++++++++----
 .../catalog_resource.fragment.graphql         |   1 +
 app/assets/javascripts/ci/catalog/index.js    |   3 +-
 .../components/formatting_toolbar.vue         |   8 +-
 .../javascripts/design_management/index.js    |   4 +-
 app/assets/javascripts/diffs/index.js         |   3 +-
 .../issuable_filtered_search_token_keys.js    |   2 +-
 .../issuable/components/issuable_by_email.vue |  21 +-
 .../issuable/components/issue_milestone.vue   |   2 +-
 .../components/issues_dashboard_app.vue       |   2 +-
 .../empty_state_without_any_issues.vue        | 158 ++++++++-------
 ...ty_state_without_any_issues_experiment.vue | 180 ++++++++++++++++++
 .../gl_card_empty_state_experiment.vue        |  34 ++++
 .../list/components/issue_card_time_info.vue  |   2 +-
 .../list/components/issues_list_app.vue       |  11 +-
 .../issues/service_desk/search_tokens.js      |   2 +-
 app/assets/javascripts/mr_notes/init_notes.js |   2 +-
 app/assets/javascripts/notes/index.js         |   2 +-
 .../javascripts/search/store/constants.js     |   2 +-
 .../javascripts/sidebar/mount_sidebar.js      |   2 +-
 .../markdown/comment_templates_dropdown.vue   |  15 +-
 .../vue_shared/components/markdown/header.vue |   8 +-
 app/assets/javascripts/work_items/index.js    |   4 +-
 .../page_bundles/issuable_list.scss           |   7 +
 app/controllers/admin/groups_controller.rb    |   5 +-
 app/controllers/groups_controller.rb          |   5 +-
 .../import/gitlab_groups_controller.rb        |   5 +-
 app/controllers/sessions_controller.rb        |   9 -
 app/helpers/issuables_helper.rb               |   7 +
 app/helpers/merge_requests_helper.rb          |   4 +-
 app/helpers/system_note_helper.rb             |   2 +-
 app/helpers/work_items_helper.rb              |   4 +-
 app/models/commit.rb                          |   3 +-
 app/models/user.rb                            |   1 +
 app/services/groups/create_service.rb         | 106 ++++++-----
 app/services/groups/nested_create_service.rb  |   2 +-
 app/views/explore/catalog/show.html.haml      |   2 +-
 app/views/projects/_issue.html.haml           |   2 +-
 .../issues/_design_management.html.haml       |   2 +-
 .../projects/issues/_discussion.html.haml     |   2 +-
 .../merge_requests/_merge_request.html.haml   |   2 +-
 .../projects/merge_requests/_page.html.haml   |   2 +-
 app/views/shared/snippets/_snippet.html.haml  |   5 +-
 .../gitlab_com_derisk/ci_fix_input_types.yml  |   9 -
 ...erify_load_performance_testing_monthly.yml |   2 +-
 ...templates_verify_accessibility_monthly.yml |   2 +-
 ...p_ci_templates_verify_failfast_monthly.yml |   2 +-
 ...tes_verify_browser_performance_monthly.yml |   2 +-
 ...ify_browser_performance_latest_monthly.yml |   2 +-
 ...lates_security_secure_binaries_monthly.yml |   2 +-
 ..._jobs_load_performance_testing_monthly.yml |   2 +-
 ...emplates_jobs_secret_detection_monthly.yml |   2 +-
 ...bs_browser_performance_testing_monthly.yml |   2 +-
 ...ser_performance_testing_latest_monthly.yml |   2 +-
 ..._jobs_load_performance_testing_monthly.yml |   2 +-
 ...bs_browser_performance_testing_monthly.yml |   2 +-
 ...ser_performance_testing_latest_monthly.yml |   2 +-
 ...licit_security_secure_binaries_monthly.yml |   2 +-
 ..._templates_qualys_iac_security_monthly.yml |   2 +-
 ...verify_load_performance_testing_weekly.yml |   2 +-
 ..._templates_verify_accessibility_weekly.yml |   2 +-
 ..._p_ci_templates_verify_failfast_weekly.yml |   2 +-
 ...ates_verify_browser_performance_weekly.yml |   2 +-
 ...rify_browser_performance_latest_weekly.yml |   2 +-
 ...plates_security_secure_binaries_weekly.yml |   2 +-
 ...s_jobs_load_performance_testing_weekly.yml |   2 +-
 ...templates_jobs_secret_detection_weekly.yml |   2 +-
 ...obs_browser_performance_testing_weekly.yml |   2 +-
 ...wser_performance_testing_latest_weekly.yml |   2 +-
 ...t_jobs_load_performance_testing_weekly.yml |   2 +-
 ...obs_browser_performance_testing_weekly.yml |   2 +-
 ...wser_performance_testing_latest_weekly.yml |   2 +-
 ...plicit_security_secure_binaries_weekly.yml |   2 +-
 ...i_templates_qualys_iac_security_weekly.yml |   2 +-
 config/routes/development.rb                  |   1 +
 data/whats_new/202403210001_16_10.yml         |  83 ++++++++
 .../monitoring/prometheus/web_exporter.md     |   2 +-
 doc/api/merge_requests.md                     |  85 ++++++++-
 doc/ci/components/index.md                    |   2 +-
 doc/ci/triggers/index.md                      |   8 +-
 doc/ci/yaml/index.md                          |  20 +-
 doc/development/database/database_lab.md      |  89 +++------
 doc/development/database/database_lab_pgai.md |  76 ++++++++
 doc/install/docker.md                         | 149 +--------------
 doc/install/docker_troubleshooting.md         | 156 +++++++++++++++
 doc/integration/kerberos.md                   | 119 ------------
 doc/integration/kerberos_troubleshooting.md   | 130 +++++++++++++
 doc/update/versions/gitlab_16_changes.md      |   2 +-
 lib/api/group_import.rb                       |   5 +-
 lib/api/groups.rb                             |   9 +-
 .../groups/loaders/group_loader.rb            |   5 +-
 lib/gitlab/ci/config/interpolation/block.rb   |   8 -
 .../ci/config/interpolation/template.rb       |  36 +---
 .../import_export/group/tree_restorer.rb      |   3 +-
 .../seeders/ci/runner/runner_fleet_seeder.rb  |   2 +-
 .../concurrency_limit/workers_concurrency.rb  |   6 +-
 .../your_work/menus/milestones_menu.rb        |   2 +-
 lib/tasks/gitlab/seed/group_seed.rake         |   4 +-
 locale/gitlab.pot                             |  30 ++-
 qa/gdk/Dockerfile.gdk                         |   2 +-
 .../auto_devops/auto_devops_templates_spec.rb |   6 +-
 spec/controllers/sessions_controller_spec.rb  |  16 ++
 spec/features/users/login_spec.rb             |   9 -
 spec/frontend/boards/mock_data.js             |   2 +-
 .../details/ci_resource_header_spec.js        |  58 +++++-
 .../pages/ci_resource_details_page_spec.js    |   2 +-
 spec/frontend/ci/catalog/mock.js              |  37 +++-
 .../components/formatting_toolbar_spec.js     |   2 +-
 .../components/issuable_by_email_spec.js      |  17 +-
 .../components/issue_milestone_spec.js        |   2 +-
 ...tate_without_any_issues_experiment_spec.js | 159 ++++++++++++++++
 .../empty_state_without_any_issues_spec.js    |  19 ++
 .../gl_card_empty_state_experiment_spec.js    |  35 ++++
 .../components/issue_card_time_info_spec.js   |   2 +-
 .../list/components/issues_list_app_spec.js   |  19 ++
 spec/frontend/search/mock_data.js             |   2 +-
 .../filtered_search_bar/mock_data.js          |   2 +-
 .../comment_templates_dropdown_spec.js        |  23 ++-
 .../components/markdown/header_spec.js        |   4 +-
 spec/frontend/work_items/mock_data.js         |   6 +-
 spec/helpers/merge_requests_helper_spec.rb    |   1 +
 spec/helpers/work_items_helper_spec.rb        |   3 +-
 .../commit_reference_filter_spec.rb           |  14 ++
 .../groups/loaders/group_loader_spec.rb       |   7 +-
 .../ci/config/interpolation/block_spec.rb     |  20 --
 .../ci/config/interpolation/template_spec.rb  |  20 --
 .../interpolation/text_interpolator_spec.rb   |   2 +-
 .../interpolation/text_template_spec.rb       |   2 +-
 .../workers_concurrency_spec.rb               |  13 ++
 spec/models/user_spec.rb                      |  24 +++
 spec/services/groups/create_service_spec.rb   |   6 +-
 spec/support/rspec_order_todo.yml             |   2 +-
 .../snippets/_snippet.html.haml_spec.rb       |   2 +-
 141 files changed, 1701 insertions(+), 756 deletions(-)
 create mode 100644 app/assets/javascripts/issues/list/components/empty_state_without_any_issues_experiment.vue
 create mode 100644 app/assets/javascripts/issues/list/components/gl_card_empty_state_experiment.vue
 delete mode 100644 config/feature_flags/gitlab_com_derisk/ci_fix_input_types.yml
 create mode 100644 data/whats_new/202403210001_16_10.yml
 create mode 100644 doc/development/database/database_lab_pgai.md
 create mode 100644 doc/install/docker_troubleshooting.md
 create mode 100644 doc/integration/kerberos_troubleshooting.md
 create mode 100644 spec/frontend/issues/list/components/empty_state_without_any_issues_experiment_spec.js
 create mode 100644 spec/frontend/issues/list/components/gl_card_empty_state_experiment_spec.js

diff --git a/.gitlab/ci/release-environments/main.gitlab-ci.yml b/.gitlab/ci/release-environments/main.gitlab-ci.yml
index 8ff0f160565..0b75e10898f 100644
--- a/.gitlab/ci/release-environments/main.gitlab-ci.yml
+++ b/.gitlab/ci/release-environments/main.gitlab-ci.yml
@@ -57,7 +57,7 @@ release-environments-qa:
     - .qa-base
   timeout: 3h
   variables:
-    QA_SCENARIO: "Test::Instance::Smoke"
+    QA_SCENARIO: "Test::Instance::Any"
     RELEASE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}"
     GITLAB_QA_OPTS: --address "https://gitlab.${ENVIRONMENT}.release.gke.gitlab.net"
     GITLAB_INITIAL_ROOT_PASSWORD: "${RELEASE_ENVIRONMENTS_ROOT_PASSWORD}"
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index d847ce8c2e2..ac6695a39d3 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-f68eed8a9d41bfe20840e87c8a9f6cd58db30de3
+cb8bec7d843749b73a0fc06f44e6aec25b378d92
diff --git a/Gemfile b/Gemfile
index 1d7c35ab3ed..bd5209e4ca6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -376,7 +376,7 @@ gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # I18n
 gem 'rails-i18n', '~> 7.0', feature_category: :internationalization
-gem 'gettext_i18n_rails', '~> 1.11.0', feature_category: :internationalization
+gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization
 gem 'gettext', '~> 3.4', '>= 3.4.9',
   require: false,
   group: [:development, :test],
@@ -419,6 +419,8 @@ group :development do
   gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling
 
   gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
+
+  gem 'gdk-toogle', '~> 0.9', require: 'toogle', feature_category: :tooling
 end
 
 group :development, :test do
@@ -500,7 +502,7 @@ end
 group :test do
   gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
-  gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling
+  gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling
   gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
   gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
   gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
diff --git a/Gemfile.checksum b/Gemfile.checksum
index f3317e56afd..a13753d37a3 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -201,10 +201,11 @@
 {"name":"fuubar","version":"2.2.0","platform":"ruby","checksum":"9b0263c4074f39c68b37f1e4e69a7d3cfc7523c41bea43601235daa723179b4a"},
 {"name":"fuzzyurl","version":"0.9.0","platform":"ruby","checksum":"542efa80f2bcaadbdc402c2f0b572f2e335a1d53e375aecad68bbb3d86860c0f"},
 {"name":"gapic-common","version":"0.20.0","platform":"ruby","checksum":"af304704b440f7a2a1e8ce6ecce109a67b79fa173f36f11b513b8a35ce509366"},
+{"name":"gdk-toogle","version":"0.9.3","platform":"ruby","checksum":"897f5d3d5d2b2d4a4438c5fb8227f2888d3ad0180353c0d62d0dece2cd22eebf"},
 {"name":"gemoji","version":"3.0.1","platform":"ruby","checksum":"80553f2f4932a7a95fb1b3c7c63f7dd937e7c8c610164bbdea28fd06eba5f36d"},
 {"name":"get_process_mem","version":"0.2.7","platform":"ruby","checksum":"4afd3c3641dd6a817c09806c7d6d509d8a9984512ac38dea8b917426bbf77eba"},
 {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
-{"name":"gettext_i18n_rails","version":"1.11.0","platform":"ruby","checksum":"e19c7e4a256c500f7f38396dca44a282b9838ae278f57c362993a54964b22bbe"},
+{"name":"gettext_i18n_rails","version":"1.12.0","platform":"ruby","checksum":"6ac4817731a9e2ce47e1e83381ac34f9142263bc2911aaaafb2526d2f1afc1be"},
 {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
 {"name":"gitaly","version":"16.10.0.pre.rc1","platform":"ruby","checksum":"483162f2c271fc78e985ad6b25bd06f69a91a4fabc2ff6f25909db7f69458cdb"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
@@ -560,7 +561,7 @@
 {"name":"rspec-retry","version":"0.6.2","platform":"ruby","checksum":"6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858"},
 {"name":"rspec-support","version":"3.12.0","platform":"ruby","checksum":"dd4d44b247ff679b95b5607ac5641d197a5f9b1d33f916123cb98fc5f917c58b"},
 {"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"},
-{"name":"rspec_profiling","version":"0.0.8","platform":"ruby","checksum":"b31ee456811b8914806a9d46b07959877fc319a0515b1c207987d70a1c499445"},
+{"name":"rspec_profiling","version":"0.0.9","platform":"ruby","checksum":"6199be2daeaa14bac3d10d704dbb0a8df052cf046332c505603263aea24f7590"},
 {"name":"rubocop","version":"1.57.2","platform":"ruby","checksum":"8f679dfe42d7821dc61dafb17d14b1294343157a197b9f8a23720ca17fb9161b"},
 {"name":"rubocop-ast","version":"1.29.0","platform":"ruby","checksum":"d1da2ab279a074baefc81758ac430c5768a8da8c7438dd4e5819ce5984d00ba1"},
 {"name":"rubocop-capybara","version":"2.19.0","platform":"ruby","checksum":"fa329e0f185be313fa5dabd6056f83a718db7f4a259aa97fc287a40254899ccb"},
diff --git a/Gemfile.lock b/Gemfile.lock
index ec8778ac997..4db14ca4fec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -669,6 +669,9 @@ GEM
       googleapis-common-protos-types (>= 1.3.1, < 2.a)
       googleauth (~> 1.0)
       grpc (~> 1.36)
+    gdk-toogle (0.9.3)
+      haml
+      rails (>= 7.0.4.2)
     gemoji (3.0.1)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
@@ -678,7 +681,7 @@ GEM
       prime
       racc
       text (>= 1.3.0)
-    gettext_i18n_rails (1.11.0)
+    gettext_i18n_rails (1.12.0)
       fast_gettext (>= 0.9.0)
     git (1.18.0)
       addressable (~> 2.8)
@@ -1471,7 +1474,7 @@ GEM
     rspec-support (3.12.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rspec_profiling (0.0.8)
+    rspec_profiling (0.0.9)
       activerecord
       get_process_mem
       rails
@@ -1899,8 +1902,9 @@ DEPENDENCIES
   fog-local (~> 0.8)
   fugit (~> 1.8.1)
   fuubar (~> 2.2.0)
+  gdk-toogle (~> 0.9)
   gettext (~> 3.4, >= 3.4.9)
-  gettext_i18n_rails (~> 1.11.0)
+  gettext_i18n_rails (~> 1.12.0)
   gitaly (~> 16.10.0.pre.rc1)
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
@@ -2076,7 +2080,7 @@ DEPENDENCIES
   rspec-rails (~> 6.1.1)
   rspec-retry (~> 0.6.2)
   rspec_junit_formatter
-  rspec_profiling (~> 0.0.8)
+  rspec_profiling (~> 0.0.9)
   rubocop
   ruby-fogbugz (~> 0.3.0)
   ruby-lsp (~> 0.14.4)
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue b/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
index a69909a68dd..a613b6e007c 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
@@ -51,7 +51,7 @@ export default {
     tokens() {
       return [
         {
-          icon: 'clock',
+          icon: 'milestone',
           title: TOKEN_TITLE_MILESTONE,
           type: TOKEN_TYPE_MILESTONE,
           token: MilestoneToken,
diff --git a/app/assets/javascripts/batch_comments/index.js b/app/assets/javascripts/batch_comments/index.js
index fe3e27a253c..a4ae6672d9a 100644
--- a/app/assets/javascripts/batch_comments/index.js
+++ b/app/assets/javascripts/batch_comments/index.js
@@ -22,7 +22,7 @@ export const initReviewBar = () => {
       ReviewBar: () => import('./components/review_bar.vue'),
     },
     provide: {
-      newCommentTemplatePath: el.dataset.newCommentTemplatePath,
+      newCommentTemplatePaths: JSON.parse(el.dataset.newCommentTemplatePaths),
       canSummarize: parseBoolean(el.dataset.canSummarize),
     },
     computed: {
diff --git a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
index 2e2d04996ee..9f215d848f6 100644
--- a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
+++ b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
@@ -145,7 +145,7 @@ export default {
         {
           type: TOKEN_TYPE_MILESTONE,
           title: TOKEN_TITLE_MILESTONE,
-          icon: 'clock',
+          icon: 'milestone',
           symbol: '%',
           token: MilestoneToken,
           unique: true,
diff --git a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
index f16d097a1b1..072b863c52b 100644
--- a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
+++ b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
@@ -1,20 +1,40 @@
 <script>
-import { GlAvatar, GlAvatarLink, GlBadge } from '@gitlab/ui';
+import {
+  GlAvatar,
+  GlAvatarLink,
+  GlBadge,
+  GlDisclosureDropdown,
+  GlDisclosureDropdownItem,
+  GlTooltipDirective,
+} from '@gitlab/ui';
+import { __ } from '~/locale';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { cleanLeadingSeparator } from '~/lib/utils/url_utility';
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
 import CiResourceAbout from './ci_resource_about.vue';
 import CiResourceHeaderSkeletonLoader from './ci_resource_header_skeleton_loader.vue';
 
 export default {
+  i18n: {
+    moreActionsLabel: __('More actions'),
+    reportAbuse: __('Report abuse to administrator'),
+  },
   components: {
+    AbuseCategorySelector,
     CiIcon,
     CiResourceAbout,
     CiResourceHeaderSkeletonLoader,
     GlAvatar,
     GlAvatarLink,
+    GlDisclosureDropdown,
+    GlDisclosureDropdownItem,
     GlBadge,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  inject: ['reportAbusePath'],
   props: {
     isLoadingDetails: {
       type: Boolean,
@@ -44,7 +64,17 @@ export default {
       required: true,
     },
   },
+  data() {
+    return {
+      isReportAbuseDrawerOpen: false,
+    };
+  },
   computed: {
+    authorId() {
+      return this.hasLatestVersion && this.latestVersion?.author?.state === 'active'
+        ? getIdFromGraphQLId(this.latestVersion?.author?.id)
+        : 0;
+    },
     entityId() {
       return getIdFromGraphQLId(this.resource.id);
     },
@@ -57,6 +87,9 @@ export default {
     latestVersion() {
       return this.resource?.versions?.nodes[0] || {};
     },
+    reportedFromUrl() {
+      return window.location.href;
+    },
     versionBadgeText() {
       return this.latestVersion.name;
     },
@@ -64,45 +97,77 @@ export default {
       return cleanLeadingSeparator(this.resource?.webPath);
     },
   },
+  methods: {
+    onAbuseButtonClicked() {
+      this.toggleReportAbuseDrawer(true);
+    },
+    toggleReportAbuseDrawer(isOpen) {
+      this.isReportAbuseDrawerOpen = isOpen;
+    },
+  },
 };
 </script>
 <template>
   <div>
     <ci-resource-header-skeleton-loader v-if="isLoadingSharedData" class="gl-py-5" />
-    <div v-else class="gl-display-flex gl-py-5">
-      <gl-avatar-link :href="resource.webPath">
-        <gl-avatar
-          class="gl-mr-4"
-          :entity-id="entityId"
-          :entity-name="resource.name"
-          shape="rect"
-          :size="64"
-          :src="resource.icon"
-        />
-      </gl-avatar-link>
-      <div
-        class="gl-display-flex gl-flex-direction-column gl-align-items-flex-start gl-justify-content-center"
-      >
-        <div class="gl-font-sm gl-text-secondary">
-          {{ webPath }}
+    <div v-else class="gl-display-flex gl-justify-content-space-between gl-py-5">
+      <div class="gl-display-flex">
+        <gl-avatar-link :href="resource.webPath">
+          <gl-avatar
+            class="gl-mr-4"
+            :entity-id="entityId"
+            :entity-name="resource.name"
+            shape="rect"
+            :size="64"
+            :src="resource.icon"
+          />
+        </gl-avatar-link>
+        <div
+          class="gl-display-flex gl-flex-direction-column gl-align-items-flex-start gl-justify-content-center"
+        >
+          <div class="gl-font-sm gl-text-secondary">
+            {{ webPath }}
+          </div>
+          <span class="gl-display-flex">
+            <div class="gl-font-lg gl-font-weight-bold">{{ resource.name }}</div>
+            <gl-badge
+              v-if="hasLatestVersion"
+              size="sm"
+              class="gl-ml-3 gl-my-1"
+              :href="latestVersion.path"
+            >
+              {{ versionBadgeText }}
+            </gl-badge>
+          </span>
+          <ci-icon
+            v-if="hasPipelineStatus"
+            :status="pipelineStatus"
+            show-status-text
+            class="gl-mt-2"
+          />
         </div>
-        <span class="gl-display-flex">
-          <div class="gl-font-lg gl-font-weight-bold">{{ resource.name }}</div>
-          <gl-badge
-            v-if="hasLatestVersion"
-            size="sm"
-            class="gl-ml-3 gl-my-1"
-            :href="latestVersion.path"
+      </div>
+      <div>
+        <gl-disclosure-dropdown
+          v-gl-tooltip
+          :title="$options.i18n.moreActionsLabel"
+          :toggle-text="$options.i18n.moreActionsLabel"
+          text-sr-only
+          icon="ellipsis_v"
+          category="tertiary"
+          placement="right"
+          class="note-action-button more-actions-toggle"
+          no-caret
+        >
+          <gl-disclosure-dropdown-item
+            data-testid="report-abuse-button"
+            @action="onAbuseButtonClicked"
           >
-            {{ versionBadgeText }}
-          </gl-badge>
-        </span>
-        <ci-icon
-          v-if="hasPipelineStatus"
-          :status="pipelineStatus"
-          show-status-text
-          class="gl-mt-2"
-        />
+            <template #list-item>
+              {{ $options.i18n.reportAbuse }}
+            </template>
+          </gl-disclosure-dropdown-item>
+        </gl-disclosure-dropdown>
       </div>
     </div>
     <ci-resource-about
@@ -120,5 +185,12 @@ export default {
     <p v-else class="gl-mt-3">
       {{ resource.description }}
     </p>
+    <abuse-category-selector
+      v-if="hasLatestVersion && isReportAbuseDrawerOpen && reportAbusePath"
+      :reported-user-id="authorId"
+      :reported-from-url="reportedFromUrl"
+      :show-drawer="isReportAbuseDrawerOpen"
+      @close-drawer="toggleReportAbuseDrawer(false)"
+    />
   </div>
 </template>
diff --git a/app/assets/javascripts/ci/catalog/graphql/fragments/catalog_resource.fragment.graphql b/app/assets/javascripts/ci/catalog/graphql/fragments/catalog_resource.fragment.graphql
index db706006688..ded14b18664 100644
--- a/app/assets/javascripts/ci/catalog/graphql/fragments/catalog_resource.fragment.graphql
+++ b/app/assets/javascripts/ci/catalog/graphql/fragments/catalog_resource.fragment.graphql
@@ -21,6 +21,7 @@ fragment CatalogResourceFields on CiCatalogResource {
       author {
         id
         name
+        state
         webUrl
       }
     }
diff --git a/app/assets/javascripts/ci/catalog/index.js b/app/assets/javascripts/ci/catalog/index.js
index 34866bfb821..0678f7f2126 100644
--- a/app/assets/javascripts/ci/catalog/index.js
+++ b/app/assets/javascripts/ci/catalog/index.js
@@ -15,7 +15,7 @@ export const initCatalog = (selector = '#js-ci-cd-catalog') => {
   }
 
   const { dataset } = el;
-  const { ciCatalogPath } = dataset;
+  const { ciCatalogPath, reportAbusePath } = dataset;
 
   Vue.use(VueApollo);
 
@@ -30,6 +30,7 @@ export const initCatalog = (selector = '#js-ci-cd-catalog') => {
     apolloProvider,
     provide: {
       ciCatalogPath,
+      reportAbusePath,
     },
     render(h) {
       return h(GlobalCatalog);
diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
index c1eae345f72..5eea12de477 100644
--- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
+++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
@@ -21,7 +21,7 @@ export default {
     HeaderDivider,
   },
   inject: {
-    newCommentTemplatePath: { default: null },
+    newCommentTemplatePaths: { default: () => [] },
     tiptapEditor: { default: null },
     contentEditor: { default: null },
   },
@@ -199,11 +199,11 @@ export default {
         :label="__('Add a quick action')"
         @execute="trackToolbarControlExecution"
       />
-      <header-divider v-if="newCommentTemplatePath" />
+      <header-divider v-if="newCommentTemplatePaths.length" />
     </div>
     <comment-templates-dropdown
-      v-if="newCommentTemplatePath"
-      :new-comment-template-path="newCommentTemplatePath"
+      v-if="newCommentTemplatePaths.length"
+      :new-comment-template-paths="newCommentTemplatePaths"
       @select="insertSavedReply"
     />
     <toolbar-more-dropdown data-testid="more" @execute="trackToolbarControlExecution" />
diff --git a/app/assets/javascripts/design_management/index.js b/app/assets/javascripts/design_management/index.js
index 12bb4b830f8..e4d3f1a3341 100644
--- a/app/assets/javascripts/design_management/index.js
+++ b/app/assets/javascripts/design_management/index.js
@@ -14,7 +14,7 @@ export default () => {
     issuePath,
     registerPath,
     signInPath,
-    newCommentTemplatePath,
+    newCommentTemplatePaths,
   } = el.dataset;
   const router = createRouter(issuePath);
 
@@ -39,7 +39,7 @@ export default () => {
       issueIid,
       registerPath,
       signInPath,
-      newCommentTemplatePath,
+      newCommentTemplatePaths: JSON.parse(newCommentTemplatePaths),
     },
     mounted() {
       performanceMarkAndMeasure({
diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js
index 9acfda93303..eed57d2edd5 100644
--- a/app/assets/javascripts/diffs/index.js
+++ b/app/assets/javascripts/diffs/index.js
@@ -17,6 +17,7 @@ export default function initDiffsApp(store = notesStore) {
   const { dataset } = el;
 
   Vue.use(VueApollo);
+  const { newCommentTemplatePaths } = dataset;
 
   const vm = new Vue({
     el,
@@ -27,7 +28,7 @@ export default function initDiffsApp(store = notesStore) {
     store,
     apolloProvider,
     provide: {
-      newCommentTemplatePath: dataset.newCommentTemplatePath,
+      newCommentTemplatePaths: newCommentTemplatePaths ? JSON.parse(newCommentTemplatePaths) : [],
     },
     data() {
       return {
diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
index 5a785de2e66..7665b53013b 100644
--- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
+++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
@@ -43,7 +43,7 @@ export const createTokenKeys = ({ disableReleaseFilter = false } = {}) => {
       type: 'string',
       param: 'title',
       symbol: '%',
-      icon: 'clock',
+      icon: 'milestone',
       tag: '%milestone',
     },
     {
diff --git a/app/assets/javascripts/issuable/components/issuable_by_email.vue b/app/assets/javascripts/issuable/components/issuable_by_email.vue
index 71ec5544c34..647339d3dc2 100644
--- a/app/assets/javascripts/issuable/components/issuable_by_email.vue
+++ b/app/assets/javascripts/issuable/components/issuable_by_email.vue
@@ -52,6 +52,23 @@ export default {
       default: '',
     },
   },
+  props: {
+    buttonClass: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    variant: {
+      type: String,
+      required: false,
+      default: 'link',
+    },
+    text: {
+      type: String,
+      required: false,
+      default: __('Email a new %{name} to this project'),
+    },
+  },
   data() {
     return {
       email: this.initialEmail,
@@ -90,8 +107,8 @@ export default {
 
 <template>
   <div>
-    <gl-button v-gl-modal="$options.modalId" variant="link"
-      ><gl-sprintf :message="__('Email a new %{name} to this project')"
+    <gl-button v-gl-modal="$options.modalId" :class="buttonClass" :variant="variant"
+      ><gl-sprintf :message="text"
         ><template #name>{{ issuableName }}</template></gl-sprintf
       ></gl-button
     >
diff --git a/app/assets/javascripts/issuable/components/issue_milestone.vue b/app/assets/javascripts/issuable/components/issue_milestone.vue
index 3340ef2338c..5f40d2f5935 100644
--- a/app/assets/javascripts/issuable/components/issue_milestone.vue
+++ b/app/assets/javascripts/issuable/components/issue_milestone.vue
@@ -73,7 +73,7 @@ export default {
 </script>
 <template>
   <div ref="milestoneDetails" class="issue-milestone-details">
-    <gl-icon :size="16" class="gl-mr-2 flex-shrink-0" name="clock" />
+    <gl-icon :size="16" class="gl-mr-2 flex-shrink-0" name="milestone" />
     <span class="milestone-title gl-display-inline-block gl-text-truncate">{{
       milestone.title
     }}</span>
diff --git a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
index 2353aceb5ae..5bce755105b 100644
--- a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
+++ b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
@@ -258,7 +258,7 @@ export default {
         {
           type: TOKEN_TYPE_MILESTONE,
           title: TOKEN_TITLE_MILESTONE,
-          icon: 'clock',
+          icon: 'milestone',
           token: MilestoneToken,
           fetchMilestones: this.fetchMilestones,
           recentSuggestionsStorageKey: 'dashboard-issues-recent-tokens-milestone',
diff --git a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
index 6741b39d5ef..382bb845311 100644
--- a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
+++ b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
@@ -3,8 +3,10 @@ import { GlButton, GlDisclosureDropdown, GlEmptyState, GlLink, GlSprintf } from
 import { helpPagePath } from '~/helpers/help_page_helper';
 import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue';
 import NewResourceDropdown from '~/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue';
+import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue';
 import { i18n } from '../constants';
 import { hasNewIssueDropdown } from '../has_new_issue_dropdown_mixin';
+import EmptyStateWithoutAnyIssuesExperiment from './empty_state_without_any_issues_experiment.vue';
 
 export default {
   i18n,
@@ -17,6 +19,8 @@ export default {
     GlLink,
     GlSprintf,
     NewResourceDropdown,
+    GitlabExperiment,
+    EmptyStateWithoutAnyIssuesExperiment,
   },
   mixins: [hasNewIssueDropdown()],
   inject: [
@@ -51,80 +55,102 @@ export default {
       required: false,
       default: false,
     },
+    showIssuableByEmail: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
 };
 </script>
 
 <template>
   <div v-if="isSignedIn">
-    <gl-empty-state
-      :title="$options.i18n.noIssuesTitle"
-      :svg-path="emptyStateSvgPath"
-      :svg-height="150"
-      data-testid="issuable-empty-state"
-    >
-      <template #description>
-        <gl-link :href="$options.issuesHelpPagePath">
-          {{ $options.i18n.noIssuesDescription }}
-        </gl-link>
-        <p v-if="canCreateProjects">
-          <strong>{{ $options.i18n.noGroupIssuesSignedInDescription }}</strong>
-        </p>
-      </template>
-      <template #actions>
-        <gl-button
-          v-if="canCreateProjects"
-          :href="newProjectPath"
-          variant="confirm"
-          class="gl-mx-2 gl-mb-3"
-        >
-          {{ $options.i18n.newProjectLabel }}
-        </gl-button>
-        <gl-button
-          v-if="showNewIssueLink"
-          :href="newIssuePath"
-          variant="confirm"
-          class="gl-mx-2 gl-mb-3"
-        >
-          {{ $options.i18n.newIssueLabel }}
-        </gl-button>
-
-        <gl-disclosure-dropdown
-          v-if="showCsvButtons"
-          class="gl-mx-2 gl-mb-3"
-          :toggle-text="$options.i18n.importIssues"
-          data-testid="import-issues-dropdown"
-        >
-          <csv-import-export-buttons
-            :export-csv-path="exportCsvPathWithQuery"
-            :issuable-count="currentTabCount"
-          />
-        </gl-disclosure-dropdown>
-
-        <new-resource-dropdown
-          v-if="showNewIssueDropdown"
-          class="gl-align-self-center gl-mx-2 gl-mb-3"
-          :query="$options.searchProjectsQuery"
-          :query-variables="newIssueDropdownQueryVariables"
-          :extract-projects="extractProjects"
-          :group-id="groupId"
+    <gitlab-experiment name="issues_mrs_empty_state">
+      <template #candidate>
+        <empty-state-without-any-issues-experiment
+          :show-csv-buttons="showCsvButtons"
+          :show-issuable-by-email="showIssuableByEmail"
         />
       </template>
-    </gl-empty-state>
-    <hr />
-    <p class="gl-text-center gl-font-weight-bold gl-mb-0">
-      {{ $options.i18n.jiraIntegrationTitle }}
-    </p>
-    <p class="gl-text-center gl-mb-0">
-      <gl-sprintf :message="$options.i18n.jiraIntegrationMessage">
-        <template #jiraDocsLink="{ content }">
-          <gl-link :href="jiraIntegrationPath">{{ content }}</gl-link>
-        </template>
-      </gl-sprintf>
-    </p>
-    <p class="gl-text-center gl-text-secondary">
-      {{ $options.i18n.jiraIntegrationSecondaryMessage }}
-    </p>
+
+      <template #control>
+        <div>
+          <gl-empty-state
+            :title="$options.i18n.noIssuesTitle"
+            :svg-path="emptyStateSvgPath"
+            :svg-height="150"
+            data-testid="issuable-empty-state"
+          >
+            <template #description>
+              <gl-link :href="$options.issuesHelpPagePath">
+                {{ $options.i18n.noIssuesDescription }}
+              </gl-link>
+              <p v-if="canCreateProjects">
+                <strong>{{ $options.i18n.noGroupIssuesSignedInDescription }}</strong>
+              </p>
+            </template>
+            <template #actions>
+              <!-- This component is shared between groups and projects issues list
+              Now issues_mrs_empty_state experiment is run only for projects page
+              If this experiment is successful new project buttons from 'control' should be
+              moved to 'candidate' template to take affect for groups page as well -->
+              <gl-button
+                v-if="canCreateProjects"
+                :href="newProjectPath"
+                variant="confirm"
+                class="gl-mx-2 gl-mb-3"
+              >
+                {{ $options.i18n.newProjectLabel }}
+              </gl-button>
+              <gl-button
+                v-if="showNewIssueLink"
+                :href="newIssuePath"
+                variant="confirm"
+                class="gl-mx-2 gl-mb-3"
+              >
+                {{ $options.i18n.newIssueLabel }}
+              </gl-button>
+
+              <gl-disclosure-dropdown
+                v-if="showCsvButtons"
+                class="gl-mx-2 gl-mb-3"
+                :toggle-text="$options.i18n.importIssues"
+                data-testid="import-issues-dropdown"
+              >
+                <csv-import-export-buttons
+                  :export-csv-path="exportCsvPathWithQuery"
+                  :issuable-count="currentTabCount"
+                />
+              </gl-disclosure-dropdown>
+
+              <new-resource-dropdown
+                v-if="showNewIssueDropdown"
+                class="gl-align-self-center gl-mx-2 gl-mb-3"
+                :query="$options.searchProjectsQuery"
+                :query-variables="newIssueDropdownQueryVariables"
+                :extract-projects="extractProjects"
+                :group-id="groupId"
+              />
+            </template>
+          </gl-empty-state>
+          <hr />
+          <p class="gl-text-center gl-font-weight-bold gl-mb-0">
+            {{ $options.i18n.jiraIntegrationTitle }}
+          </p>
+          <p class="gl-text-center gl-mb-0">
+            <gl-sprintf :message="$options.i18n.jiraIntegrationMessage">
+              <template #jiraDocsLink="{ content }">
+                <gl-link :href="jiraIntegrationPath">{{ content }}</gl-link>
+              </template>
+            </gl-sprintf>
+          </p>
+          <p class="gl-text-center gl-text-secondary">
+            {{ $options.i18n.jiraIntegrationSecondaryMessage }}
+          </p>
+        </div>
+      </template>
+    </gitlab-experiment>
   </div>
 
   <gl-empty-state
diff --git a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues_experiment.vue b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues_experiment.vue
new file mode 100644
index 00000000000..37fc8b97489
--- /dev/null
+++ b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues_experiment.vue
@@ -0,0 +1,180 @@
+<script>
+import { GlButton, GlModalDirective, GlIcon } from '@gitlab/ui';
+import { TYPE_ISSUE } from '~/issues/constants';
+import { helpPagePath } from '~/helpers/help_page_helper';
+import IssuableByEmail from '~/issuable/components/issuable_by_email.vue';
+import CsvImportModal from '~/issuable/components/csv_import_modal.vue';
+import { i18n } from '../constants';
+import GlCardEmptyStateExperiment from './gl_card_empty_state_experiment.vue';
+
+export default {
+  i18n,
+  issuesHelpPagePath: helpPagePath('user/project/issues/index'),
+  components: {
+    GlCardEmptyStateExperiment,
+    GlButton,
+    GlIcon,
+    IssuableByEmail,
+    CsvImportModal,
+  },
+  directives: {
+    GlModal: GlModalDirective,
+  },
+  inject: {
+    jiraIntegrationPath: {
+      default: null,
+    },
+    newIssuePath: {
+      default: null,
+    },
+    showNewIssueLink: {
+      default: false,
+    },
+    showImportButton: {
+      default: false,
+    },
+    canEdit: {
+      default: false,
+    },
+    projectImportJiraPath: {
+      default: null,
+    },
+  },
+  props: {
+    showCsvButtons: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    showIssuableByEmail: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  computed: {
+    importModalId() {
+      return `${TYPE_ISSUE}-import-modal`;
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="gl-text-center gl-empty-state">
+    <iframe
+      class="video-container gl-h-auto gl-w-full"
+      src="https://www.youtube-nocookie.com/embed/-4SGhGpwZDY?si=Ym-29hpY22cgdGdH"
+      title="Create an Issue - The basics"
+      frameborder="0"
+      allow="accelerometer; encrypted-media; gyroscope;"
+      sandbox="allow-scripts allow-same-origin allow-presentation"
+      data-testid="create-an-issue-iframe-video"
+      allowfullscreen
+    ></iframe>
+
+    <h1 class="gl-font-size-h-display gl-max-w-75 gl-m-auto gl-pt-8">
+      {{ $options.i18n.noIssuesTitle }}
+    </h1>
+
+    <p class="gl-max-w-75 gl-m-auto gl-pt-4 gl-pb-5">
+      {{
+        __(
+          'With issues you can discuss the implementation of an idea, track tasks and work status, elaborate on code implementations, and accept feature proposals, questions, support requests, or bug reports.',
+        )
+      }}
+    </p>
+
+    <div
+      class="gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row gl-justify-content-center gl-gap-3"
+    >
+      <gl-button
+        v-if="showNewIssueLink"
+        :href="newIssuePath"
+        variant="confirm"
+        data-testid="empty-state-new-issue-btn"
+      >
+        {{ __('Create a new issue') }}
+      </gl-button>
+
+      <issuable-by-email
+        v-if="showIssuableByEmail"
+        button-class="gl-w-full"
+        variant="default"
+        :text="__('Email a new issue')"
+      />
+    </div>
+
+    <div class="gl-display-flex gl-flex-direction-column gl-gap-6 gl-max-w-88 gl-mx-auto gl-pt-9">
+      <div
+        class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-justify-content-center gl-gap-6"
+      >
+        <gl-card-empty-state-experiment v-if="showCsvButtons && showImportButton" icon="download">
+          <template #header>
+            {{ __('Import existing issues') }}
+          </template>
+          <template #body>
+            <csv-import-modal :modal-id="importModalId" />
+
+            <div class="gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row gl-gap-3">
+              <gl-button
+                v-gl-modal="importModalId"
+                class="gl-mt-3 gl-ml-0! gl-mb-0!"
+                data-testid="empty-state-import-csv-btn"
+              >
+                {{ __('Import CSV') }}
+              </gl-button>
+
+              <gl-button
+                v-if="canEdit"
+                class="gl-mt-3 gl-mb-0!"
+                :href="projectImportJiraPath"
+                data-testid="empty-state-import-jira-btn"
+              >
+                {{ __('Import from Jira') }}
+              </gl-button>
+            </div>
+          </template>
+        </gl-card-empty-state-experiment>
+
+        <a class="gl-text-decoration-none!" :href="$options.issuesHelpPagePath">
+          <gl-card-empty-state-experiment
+            class="gl-h-13 gl-justify-content-center gl-hover-text-blue-600 gl-text-gray-900"
+            icon="issue-type-issue"
+          >
+            <template #header>
+              {{ __('Learn more about issues') }}
+              <gl-icon class="gl-display-inline gl-ml-2" name="arrow-right" />
+            </template>
+
+            <template #body>
+              <span class="gl-text-gray-900">{{ __('Read our documentation') }}</span>
+            </template>
+          </gl-card-empty-state-experiment>
+        </a>
+      </div>
+
+      <div
+        class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-justify-content-center"
+      >
+        <a class="gl-text-decoration-none!" :href="jiraIntegrationPath">
+          <gl-card-empty-state-experiment
+            class="gl-h-13 gl-hover-text-blue-600 gl-text-gray-900"
+            icon="api"
+          >
+            <template #header>
+              {{ __('Enable Jira integration') }}
+              <gl-icon class="gl-display-inline gl-ml-2" name="arrow-right" />
+            </template>
+
+            <template #body>
+              <span class="gl-text-gray-900">
+                {{ __('This feature is only available on paid plans.') }}
+              </span>
+            </template>
+          </gl-card-empty-state-experiment>
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/assets/javascripts/issues/list/components/gl_card_empty_state_experiment.vue b/app/assets/javascripts/issues/list/components/gl_card_empty_state_experiment.vue
new file mode 100644
index 00000000000..341a5f38a8e
--- /dev/null
+++ b/app/assets/javascripts/issues/list/components/gl_card_empty_state_experiment.vue
@@ -0,0 +1,34 @@
+<script>
+import { GlCard, GlIcon } from '@gitlab/ui';
+
+export default {
+  components: {
+    GlCard,
+    GlIcon,
+  },
+  props: {
+    icon: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-card class="gl-text-left gl-hover-bg-blue-50">
+    <div class="gl-display-flex gl-gap-4">
+      <div class="gl-display-flex gl-my-auto gl-bg-blue-100 gl-rounded-full gl-min-w-8 gl-min-h-8">
+        <gl-icon class="gl-display-flex gl-m-auto gl-text-gray-900" :name="icon" />
+      </div>
+
+      <div class="gl-w-31">
+        <p class="gl-heading-4 gl-mb-1!">
+          <slot name="header"></slot>
+        </p>
+
+        <slot name="body"></slot>
+      </div>
+    </div>
+  </gl-card>
+</template>
diff --git a/app/assets/javascripts/issues/list/components/issue_card_time_info.vue b/app/assets/javascripts/issues/list/components/issue_card_time_info.vue
index 22c0984ebdb..a263017fed4 100644
--- a/app/assets/javascripts/issues/list/components/issue_card_time_info.vue
+++ b/app/assets/javascripts/issues/list/components/issue_card_time_info.vue
@@ -95,7 +95,7 @@ export default {
         :title="milestoneDate"
         class="gl-font-sm gl-text-gray-500!"
       >
-        <gl-icon name="clock" :size="12" />
+        <gl-icon name="milestone" :size="12" />
         {{ milestone.title }}
       </gl-link>
     </span>
diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue
index 3469dfdc804..a87b6b65416 100644
--- a/app/assets/javascripts/issues/list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue
@@ -75,6 +75,7 @@ import NewResourceDropdown from '~/vue_shared/components/new_resource_dropdown/n
 import WorkItemDetail from '~/work_items/components/work_item_detail.vue';
 import deleteWorkItemMutation from '~/work_items/graphql/delete_work_item.mutation.graphql';
 import { WORK_ITEM_TYPE_ENUM_OBJECTIVE } from '~/work_items/constants';
+import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue';
 import {
   CREATED_DESC,
   defaultTypeTokenOptions,
@@ -153,6 +154,7 @@ export default {
     LocalStorageSync,
     WorkItemDetail,
     GlLink,
+    GitlabExperiment,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -403,7 +405,7 @@ export default {
         {
           type: TOKEN_TYPE_MILESTONE,
           title: TOKEN_TITLE_MILESTONE,
-          icon: 'clock',
+          icon: 'milestone',
           token: MilestoneToken,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-milestone`,
           shouldSkipSort: true,
@@ -1073,8 +1075,13 @@ export default {
       :export-csv-path-with-query="exportCsvPathWithQuery"
       :show-csv-buttons="showCsvButtons"
       :show-new-issue-dropdown="showNewIssueDropdown"
+      :show-issuable-by-email="showIssuableByEmail"
     />
 
-    <issuable-by-email v-if="showIssuableByEmail" class="gl-text-center gl-pt-5 gl-pb-7" />
+    <gitlab-experiment v-if="showIssuableByEmail" name="issues_mrs_empty_state">
+      <template #control>
+        <issuable-by-email class="gl-text-center gl-pt-5 gl-pb-7" />
+      </template>
+    </gitlab-experiment>
   </div>
 </template>
diff --git a/app/assets/javascripts/issues/service_desk/search_tokens.js b/app/assets/javascripts/issues/service_desk/search_tokens.js
index 72750f518e4..d72ecc78c22 100644
--- a/app/assets/javascripts/issues/service_desk/search_tokens.js
+++ b/app/assets/javascripts/issues/service_desk/search_tokens.js
@@ -56,7 +56,7 @@ export const assigneeTokenBase = {
 export const milestoneTokenBase = {
   type: TOKEN_TYPE_MILESTONE,
   title: TOKEN_TITLE_MILESTONE,
-  icon: 'clock',
+  icon: 'milestone',
   token: MilestoneToken,
   shouldSkipSort: true,
 };
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js
index 265e2a2f880..f3e12e0672b 100644
--- a/app/assets/javascripts/mr_notes/init_notes.js
+++ b/app/assets/javascripts/mr_notes/init_notes.js
@@ -42,7 +42,7 @@ export default () => {
     apolloProvider,
     provide: {
       reportAbusePath: notesDataset.reportAbusePath,
-      newCommentTemplatePath: notesDataset.newCommentTemplatePath,
+      newCommentTemplatePaths: JSON.parse(notesDataset.newCommentTemplatePaths),
       mrFilter: true,
       newCustomEmojiPath: notesDataset.newCustomEmojiPath,
     },
diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js
index f9fbe6659ee..0931d404be0 100644
--- a/app/assets/javascripts/notes/index.js
+++ b/app/assets/javascripts/notes/index.js
@@ -59,7 +59,7 @@ export default ({ editorAiActions = [] } = {}) => {
     provide: {
       showTimelineViewToggle,
       reportAbusePath: notesDataset.reportAbusePath,
-      newCommentTemplatePath: notesDataset.newCommentTemplatePath,
+      newCommentTemplatePaths: JSON.parse(notesDataset.newCommentTemplatePaths),
       resourceGlobalId: convertToGraphQLId(noteableData.noteableType, noteableData.id),
       editorAiActions: editorAiActions.map((factory) => factory(noteableData)),
       newCustomEmojiPath: notesDataset.newCustomEmojiPath,
diff --git a/app/assets/javascripts/search/store/constants.js b/app/assets/javascripts/search/store/constants.js
index 1d6720b5936..3ae8366d129 100644
--- a/app/assets/javascripts/search/store/constants.js
+++ b/app/assets/javascripts/search/store/constants.js
@@ -29,7 +29,7 @@ export const ICON_MAP = {
   merge_requests: 'merge-request',
   commits: 'commit',
   notes: 'comments',
-  milestones: 'clock',
+  milestones: 'milestone',
   users: 'users',
   projects: 'project',
   wiki_blobs: 'book',
diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js
index fe9f15414cf..c7af7398eff 100644
--- a/app/assets/javascripts/sidebar/mount_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_sidebar.js
@@ -272,7 +272,7 @@ function mountSidebarMilestoneWidget() {
           iid: issueIid,
           issuableType: isInIssuePage() || isInDesignPage() ? TYPE_ISSUE : TYPE_MERGE_REQUEST,
           issuableAttribute: IssuableAttributeType.Milestone,
-          icon: 'clock',
+          icon: 'milestone',
         },
       }),
   });
diff --git a/app/assets/javascripts/vue_shared/components/markdown/comment_templates_dropdown.vue b/app/assets/javascripts/vue_shared/components/markdown/comment_templates_dropdown.vue
index de6237c2d6b..7bf433795a5 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/comment_templates_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/comment_templates_dropdown.vue
@@ -42,8 +42,8 @@ export default {
   },
   mixins: [InternalEvents.mixin()],
   props: {
-    newCommentTemplatePath: {
-      type: String,
+    newCommentTemplatePaths: {
+      type: Array,
       required: true,
     },
   },
@@ -147,14 +147,17 @@ export default {
       </template>
       <template #footer>
         <div
-          class="gl-border-t-solid gl-border-t-1 gl-border-t-gray-200 gl-display-flex gl-justify-content-center gl-p-2"
+          class="gl-border-t-solid gl-border-t-1 gl-border-t-gray-200 gl-display-flex gl-justify-content-center gl-flex-direction-column gl-p-2"
         >
           <gl-button
-            :href="newCommentTemplatePath"
+            v-for="(manage, index) in newCommentTemplatePaths"
+            :key="index"
+            :href="manage.path"
             category="tertiary"
             block
             class="gl-justify-content-start! gl-mt-0! gl-mb-0! gl-px-3!"
-            >{{ __('Add a new comment template') }}</gl-button
+            data-testid="manage-button"
+            >{{ manage.text }}</gl-button
           >
         </div>
       </template>
@@ -167,7 +170,7 @@ export default {
 
 <style>
 .comment-template-dropdown .gl-new-dropdown-panel {
-  width: 350px;
+  width: 350px !important;
 }
 
 .comment-template-dropdown .gl-new-dropdown-item-check-icon {
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 525f684df86..b1ced003e6d 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -38,8 +38,8 @@ export default {
   },
   mixins: [glFeatureFlagsMixin()],
   inject: {
-    newCommentTemplatePath: {
-      default: null,
+    newCommentTemplatePaths: {
+      default: () => [],
     },
     editorAiActions: { default: () => [] },
     mrGeneratedContent: { default: null },
@@ -512,8 +512,8 @@ export default {
             tracking-property="quickAction"
           />
           <comment-templates-dropdown
-            v-if="!previewMarkdown && newCommentTemplatePath"
-            :new-comment-template-path="newCommentTemplatePath"
+            v-if="!previewMarkdown && newCommentTemplatePaths.length"
+            :new-comment-template-paths="newCommentTemplatePaths"
             @select="insertSavedReply"
           />
         </div>
diff --git a/app/assets/javascripts/work_items/index.js b/app/assets/javascripts/work_items/index.js
index 1ef5e851d4f..51f48b3f6b6 100644
--- a/app/assets/javascripts/work_items/index.js
+++ b/app/assets/javascripts/work_items/index.js
@@ -25,7 +25,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType } = {}) => {
     hasIterationsFeature,
     hasOkrsFeature,
     hasIssuableHealthStatusFeature,
-    newCommentTemplatePath,
+    newCommentTemplatePaths,
     reportAbusePath,
   } = el.dataset;
 
@@ -46,7 +46,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType } = {}) => {
       signInPath,
       hasIterationsFeature: parseBoolean(hasIterationsFeature),
       hasIssuableHealthStatusFeature: parseBoolean(hasIssuableHealthStatusFeature),
-      newCommentTemplatePath,
+      newCommentTemplatePaths: JSON.parse(newCommentTemplatePaths),
       reportAbusePath,
     },
     render(createElement) {
diff --git a/app/assets/stylesheets/page_bundles/issuable_list.scss b/app/assets/stylesheets/page_bundles/issuable_list.scss
index c2955a8a256..4f932a9a20f 100644
--- a/app/assets/stylesheets/page_bundles/issuable_list.scss
+++ b/app/assets/stylesheets/page_bundles/issuable_list.scss
@@ -106,3 +106,10 @@
     }
   }
 }
+
+.gl-empty-state {
+  .video-container {
+    aspect-ratio: 16/9;
+    max-width: 350px;
+  }
+}
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 001f5242138..b3d6ef52628 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -38,9 +38,10 @@ class Admin::GroupsController < Admin::ApplicationController
   end
 
   def create
-    @group = ::Groups::CreateService.new(current_user, group_params).execute
+    response = ::Groups::CreateService.new(current_user, group_params).execute
+    @group = response[:group]
 
-    if @group.persisted?
+    if response.success?
       redirect_to [:admin, @group], notice: format(_('Group %{group_name} was successfully created.'), group_name: @group.name)
     else
       render "new"
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 80bc4312154..251abcc6d84 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -85,9 +85,10 @@ class GroupsController < Groups::ApplicationController
   end
 
   def create
-    @group = Groups::CreateService.new(current_user, group_params).execute
+    response = Groups::CreateService.new(current_user, group_params).execute
+    @group = response[:group]
 
-    if @group.persisted?
+    if response.success?
       successful_creation_hooks
 
       notice = if @group.chat_team.present?
diff --git a/app/controllers/import/gitlab_groups_controller.rb b/app/controllers/import/gitlab_groups_controller.rb
index 81f18a18776..95ba29b7665 100644
--- a/app/controllers/import/gitlab_groups_controller.rb
+++ b/app/controllers/import/gitlab_groups_controller.rb
@@ -18,9 +18,10 @@ class Import::GitlabGroupsController < ApplicationController
       import_export_upload: ImportExportUpload.new(import_file: group_params[:file])
     )
 
-    group = ::Groups::CreateService.new(current_user, group_data).execute
+    response = ::Groups::CreateService.new(current_user, group_data).execute
+    group = response[:group]
 
-    if group.persisted?
+    if response.success?
       if Groups::ImportExport::ImportService.new(group: group, user: current_user).async_execute
         redirect_to(
           group_path(group),
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index ed79142e98c..e7b996e527c 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -26,8 +26,6 @@ class SessionsController < Devise::SessionsController
   prepend_before_action :check_captcha, only: [:create]
   prepend_before_action :store_redirect_uri, only: [:new]
   prepend_before_action :require_no_authentication_without_flash, only: [:new, :create]
-  prepend_before_action :ensure_user_allowed_to_password_authenticate,
-    if: -> { action_name == 'create' && password_based_login? }
   prepend_before_action :ensure_password_authentication_enabled!,
     if: -> { action_name == 'create' && password_based_login? }
   before_action :auto_sign_in_with_provider, only: [:new]
@@ -316,13 +314,6 @@ class SessionsController < Devise::SessionsController
   def set_invite_params
     @invite_email = ActionController::Base.helpers.sanitize(params[:invite_email])
   end
-
-  def ensure_user_allowed_to_password_authenticate
-    return unless find_user
-    return if find_user.allow_password_authentication_for_web? && !find_user.password_based_login_forbidden?
-
-    redirect_to new_user_session_path, alert: I18n.t('devise.failure.invalid')
-  end
 end
 
 SessionsController.prepend_mod_with('SessionsController')
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index e02b4fa0410..aba127d2434 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -417,6 +417,13 @@ module IssuablesHelper
       }
     }
   end
+
+  def new_comment_template_paths(group)
+    [{
+      text: _('Manage your comment templates'),
+      path: profile_comment_templates_path
+    }]
+  end
 end
 
 IssuablesHelper.prepend_mod_with('IssuablesHelper')
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index d2dcdff4602..583b4ce76b0 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -198,7 +198,7 @@ module MergeRequestsHelper
       source_project_default_url: merge_request.source_project && default_url_to_repo(merge_request.source_project),
       source_project_full_path: merge_request.source_project&.full_path,
       is_forked: project.forked?.to_s,
-      new_comment_template_path: profile_comment_templates_path,
+      new_comment_template_paths: new_comment_template_paths(project.group).to_json,
       iid: merge_request.iid,
       per_page: DIFF_BATCH_ENDPOINT_PER_PAGE,
       pinned_file_url: @pinned_file_url
@@ -315,7 +315,7 @@ module MergeRequestsHelper
   end
 
   def review_bar_data(_merge_request, _user)
-    { new_comment_template_path: profile_comment_templates_path }
+    { new_comment_template_paths: new_comment_template_paths(@project.group).to_json }
   end
 
   def project_merge_requests_list_data(project, current_user)
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index d7ca76f6a8a..52df96f1ee5 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -21,7 +21,7 @@ module SystemNoteHelper
     'branch' => 'fork',
     'confidential' => 'eye-slash',
     'visible' => 'eye',
-    'milestone' => 'clock',
+    'milestone' => 'milestone',
     'discussion' => 'comment',
     'moved' => 'arrow-right',
     'outdated' => 'pencil',
diff --git a/app/helpers/work_items_helper.rb b/app/helpers/work_items_helper.rb
index 64f7ddd1e7c..c4f6d68fed9 100644
--- a/app/helpers/work_items_helper.rb
+++ b/app/helpers/work_items_helper.rb
@@ -2,13 +2,15 @@
 
 module WorkItemsHelper
   def work_items_show_data(resource_parent)
+    group = resource_parent.is_a?(Group) ? resource_parent : resource_parent.group
+
     {
       full_path: resource_parent.full_path,
       issues_list_path:
         resource_parent.is_a?(Group) ? issues_group_path(resource_parent) : project_issues_path(resource_parent),
       register_path: new_user_registration_path(redirect_to_referer: 'yes'),
       sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'),
-      new_comment_template_path: profile_comment_templates_path,
+      new_comment_template_paths: new_comment_template_paths(group).to_json,
       report_abuse_path: add_category_abuse_reports_path
     }
   end
diff --git a/app/models/commit.rb b/app/models/commit.rb
index eca984f48fa..9704bfeb6f2 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -31,6 +31,7 @@ class Commit
   MIN_SHA_LENGTH = Gitlab::Git::Commit::MIN_SHA_LENGTH
   MAX_SHA_LENGTH = Gitlab::Git::Commit::MAX_SHA_LENGTH
   COMMIT_SHA_PATTERN = Gitlab::Git::Commit::SHA_PATTERN
+  WHOLE_WORD_COMMIT_SHA_PATTERN = /\b#{COMMIT_SHA_PATTERN}\b/
   EXACT_COMMIT_SHA_PATTERN = /\A#{COMMIT_SHA_PATTERN}\z/
   # Used by GFM to match and present link extensions on node texts and hrefs.
   LINK_EXTENSION_PATTERN = /(patch)/
@@ -205,7 +206,7 @@ class Commit
   def self.reference_pattern
     @reference_pattern ||= %r{
       (?:#{Project.reference_pattern}#{reference_prefix})?
-      (?<commit>#{COMMIT_SHA_PATTERN})
+      (?<commit>#{WHOLE_WORD_COMMIT_SHA_PATTERN})
     }x
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 789660bc558..eff607fc1a0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1058,6 +1058,7 @@ class User < MainClusterwide::ApplicationRecord
   def valid_password?(password)
     return false unless password_allowed?(password)
     return false if password_automatically_set?
+    return false unless allow_password_authentication?
 
     super
   end
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 071f4750b8d..c42853e6e29 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -2,6 +2,9 @@
 
 module Groups
   class CreateService < Groups::BaseService
+    VisibilityError = Class.new(StandardError)
+    PermissionError = Class.new(StandardError)
+
     def initialize(user, params = {})
       @current_user = user
       @params = params.dup
@@ -10,6 +13,43 @@ module Groups
     end
 
     def execute
+      build_group
+      after_build_hook
+
+      validate_visibility_level!
+      validate_user_permissions!
+
+      @group.name ||= @group.path.dup
+
+      create_chat_team
+      create_group
+
+      if @group.persisted?
+        after_successful_creation_hook
+
+        ServiceResponse.success(payload: { group: @group })
+      else
+        ServiceResponse.error(message: 'Group has errors', payload: { group: @group })
+      end
+
+    rescue VisibilityError, PermissionError
+      ServiceResponse.error(message: 'Group has errors', payload: { group: @group })
+    end
+
+    private
+
+    attr_reader :create_event
+
+    def create_chat_team
+      return unless valid_to_create_chat_team?
+
+      response = ::Mattermost::CreateTeamService.new(@group, current_user).execute
+      return ServiceResponse.error(message: 'Group has errors', payload: { group: @group }) if @group.errors.any?
+
+      @group.build_chat_team(name: response['name'], team_id: response['id'])
+    end
+
+    def build_group
       remove_unallowed_params
       set_visibility_level
 
@@ -19,24 +59,9 @@ module Groups
 
       @group.build_namespace_settings
       handle_namespace_settings
+    end
 
-      after_build_hook(@group, params)
-
-      inherit_group_shared_runners_settings
-
-      unless can_use_visibility_level? && can_create_group?
-        return @group
-      end
-
-      @group.name ||= @group.path.dup
-
-      if create_chat_team?
-        response = ::Mattermost::CreateTeamService.new(@group, current_user).execute
-        return @group if @group.errors.any?
-
-        @group.build_chat_team(name: response['name'], team_id: response['id'])
-      end
-
+    def create_group
       Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction(
         %w[routes redirect_routes], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424281'
       ) do
@@ -47,21 +72,13 @@ module Groups
           end
         end
       end
-
-      after_create_hook
-
-      @group
     end
 
-    private
-
-    attr_reader :create_event
-
-    def after_build_hook(group, params)
-      # overridden in EE
+    def after_build_hook
+      inherit_group_shared_runners_settings
     end
 
-    def after_create_hook
+    def after_successful_creation_hook
       # overridden in EE
     end
 
@@ -76,35 +93,33 @@ module Groups
       params.delete(:lock_math_rendering_limits_enabled)
     end
 
-    def create_chat_team?
-      Gitlab.config.mattermost.enabled && @chat_team && group.chat_team.nil?
+    def valid_to_create_chat_team?
+      Gitlab.config.mattermost.enabled && @chat_team && @group.chat_team.nil?
     end
 
-    def can_create_group?
+    def validate_user_permissions!
       if @group.subgroup?
         unless can?(current_user, :create_subgroup, @group.parent)
           @group.parent = nil
           @group.errors.add(:parent_id, s_('CreateGroup|You don’t have permission to create a subgroup in this group.'))
 
-          return false
+          raise PermissionError
         end
       else
         unless can?(current_user, :create_group)
           @group.errors.add(:base, s_('CreateGroup|You don’t have permission to create groups.'))
 
-          return false
+          raise PermissionError
         end
       end
 
-      unless organization_setting_valid?
-        # We are unsetting this here to match behavior of invalid parent_id above and protect against possible
-        # committing to the database of a value that isn't allowed.
-        @group.organization = nil
+      return if organization_setting_valid?
 
-        return false
-      end
+      # We are unsetting this here to match behavior of invalid parent_id above and protect against possible
+      # committing to the database of a value that isn't allowed.
+      @group.organization = nil
 
-      true
+      raise PermissionError
     end
 
     def can_create_group_in_organization?
@@ -143,13 +158,12 @@ module Groups
       can_create_group_in_organization? && matches_parent_organization?
     end
 
-    def can_use_visibility_level?
-      unless Gitlab::VisibilityLevel.allowed_for?(current_user, visibility_level)
-        deny_visibility_level(@group)
-        return false
-      end
+    def validate_visibility_level!
+      return if Gitlab::VisibilityLevel.allowed_for?(current_user, visibility_level)
 
-      true
+      deny_visibility_level(@group)
+
+      raise VisibilityError, 'Visibility level not allowed'
     end
 
     def set_visibility_level
diff --git a/app/services/groups/nested_create_service.rb b/app/services/groups/nested_create_service.rb
index 35d45aaf0cc..5b29470d74e 100644
--- a/app/services/groups/nested_create_service.rb
+++ b/app/services/groups/nested_create_service.rb
@@ -41,7 +41,7 @@ module Groups
         )
 
         last_group = namespace_or_group(partial_path) ||
-          Groups::CreateService.new(current_user, new_params).execute
+          Groups::CreateService.new(current_user, new_params).execute[:group]
       end
 
       last_group
diff --git a/app/views/explore/catalog/show.html.haml b/app/views/explore/catalog/show.html.haml
index 7c8d788f8e3..554abae20ed 100644
--- a/app/views/explore/catalog/show.html.haml
+++ b/app/views/explore/catalog/show.html.haml
@@ -1,3 +1,3 @@
 - page_title _('CI/CD Catalog')
 
-#js-ci-cd-catalog{ data: { ci_catalog_path: explore_catalog_index_path } }
+#js-ci-cd-catalog{ data: { ci_catalog_path: explore_catalog_index_path, report_abuse_path: add_category_abuse_reports_path } }
diff --git a/app/views/projects/_issue.html.haml b/app/views/projects/_issue.html.haml
index 9550c096115..cc1d9a51811 100644
--- a/app/views/projects/_issue.html.haml
+++ b/app/views/projects/_issue.html.haml
@@ -27,7 +27,7 @@
           %span.issuable-milestone.gl-display-none.gl-sm-display-inline-block
             &nbsp;
             = link_to project_issues_path(issue.project, milestone_title: issue.milestone.title), data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(issue.milestone) } do
-              = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom')
+              = sprite_icon('milestone', css_class: 'gl-vertical-align-text-bottom')
               = issue.milestone.title
         - if issue.due_date
           %span.issuable-due-date.gl-display-none.gl-sm-display-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue? && !issue.closed?}", title: _('Due date') }
diff --git a/app/views/projects/issues/_design_management.html.haml b/app/views/projects/issues/_design_management.html.haml
index de8725df871..7298890924b 100644
--- a/app/views/projects/issues/_design_management.html.haml
+++ b/app/views/projects/issues/_design_management.html.haml
@@ -13,7 +13,7 @@
     issue_path: project_issue_path(@project, @issue),
     register_path: new_user_registration_path(redirect_to_referer: 'yes'),
     sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'),
-    new_comment_template_path: profile_comment_templates_path } }
+    new_comment_template_paths: new_comment_template_paths(@project.group).to_json } }
 - else
   .gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center
     = enable_lfs_message
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 5cb7fa8816e..15026452e76 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -13,5 +13,5 @@
     current_user_data: UserSerializer.new.represent(current_user, {only_path: true}, CurrentUserEntity).to_json,
     can_add_timeline_events: "#{can?(current_user, :admin_incident_management_timeline_event, @issue)}",
     report_abuse_path: add_category_abuse_reports_path,
-    new_comment_template_path: profile_comment_templates_path,
+    new_comment_template_paths: new_comment_template_paths(@project.group).to_json,
     new_custom_emoji_path: new_custom_emoji_path(@project.group) } }
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 71af7d5634f..0b90b7409aa 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -29,7 +29,7 @@
           %span.issuable-milestone.gl-display-none.gl-sm-display-inline-block.gl-text-truncate.gl-max-w-26.gl-vertical-align-bottom
             &nbsp;
             = link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), class: 'gl-text-gray-500!', data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do
-              = sprite_icon('clock', size: 12, css_class: 'gl-vertical-align-text-bottom')
+              = sprite_icon('milestone', size: 12, css_class: 'gl-vertical-align-text-bottom')
               = merge_request.milestone.title
         - if merge_request.target_project.default_branch != merge_request.target_branch
           %span.project-ref-path.has-tooltip.d-inline-block.gl-text-truncate.gl-max-w-26.gl-vertical-align-bottom{ title: _('Target branch: %{target_branch}') % {target_branch: merge_request.target_branch} }
diff --git a/app/views/projects/merge_requests/_page.html.haml b/app/views/projects/merge_requests/_page.html.haml
index 4b431edfd87..32f916c6b10 100644
--- a/app/views/projects/merge_requests/_page.html.haml
+++ b/app/views/projects/merge_requests/_page.html.haml
@@ -83,7 +83,7 @@
                 current_user_data: @current_user_data,
                 is_locked: @merge_request.discussion_locked.to_s,
                 report_abuse_path: add_category_abuse_reports_path,
-                new_comment_template_path: profile_comment_templates_path,
+                new_comment_template_paths: new_comment_template_paths(@project.group).to_json,
                 new_custom_emoji_path: new_custom_emoji_path(@project.group) } }
           = render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees, reviewers: @merge_request.reviewers, source_branch: @merge_request.source_branch
 
diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml
index 702f101b48e..5d1c0ae03c7 100644
--- a/app/views/shared/snippets/_snippet.html.haml
+++ b/app/views/shared/snippets/_snippet.html.haml
@@ -18,9 +18,8 @@
         = sprite_icon('comments', css_class: 'gl-vertical-align-text-bottom')
         = notes_count
     %li
-      %span.sr-only{ data: { testid: 'snippet-visibility-content', qa_snippet_visibility: visibility_level_label(snippet.visibility_level) } }
-        = visibility_level_label(snippet.visibility_level)
-      = visibility_level_icon(snippet.visibility_level)
+      %span.has-tooltip{ title: visibility_level_label(snippet.visibility_level), data: { testid: 'snippet-visibility-content', qa_snippet_visibility: visibility_level_label(snippet.visibility_level) } }
+        = visibility_level_icon(snippet.visibility_level)
 
   .snippet-info
     .gl-display-inline{ data: { testid: 'snippet-created-at'} }
diff --git a/config/feature_flags/gitlab_com_derisk/ci_fix_input_types.yml b/config/feature_flags/gitlab_com_derisk/ci_fix_input_types.yml
deleted file mode 100644
index b910822c618..00000000000
--- a/config/feature_flags/gitlab_com_derisk/ci_fix_input_types.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: ci_fix_input_types
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434826
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145257
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/443301
-milestone: '16.10'
-group: group::pipeline authoring
-type: gitlab_com_derisk
-default_enabled: false
diff --git a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
index e17ceeb00db..2c82cc37599 100644
--- a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_load_performance
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
index 71dbfa2bc99..b8e80ce4e14 100644
--- a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
+++ b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_accessibility_mo
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
index 2419653655b..2a5134a3032 100644
--- a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_failfast_monthly
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
index 1404da33a1b..084461a7fd4 100644
--- a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
+++ b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performa
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
index 6ad88c0a492..cf1b882dfa5 100644
--- a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performa
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
index 36e672b0295..3eae57f0483 100644
--- a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secure_binarie
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: static_analysis
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
index 21193bc9205..d0ab8a53a9c 100644
--- a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_load_performance_t
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
index a9d0ebecc80..abd6a1c2ab8 100644
--- a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_m
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: static_analysis
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
index c2926eef7b6..46235706533 100644
--- a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performanc
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
index c99a6789349..ce6b7871a49 100644
--- a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performanc
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
index 373fc6e596f..1fbd545ad16 100644
--- a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_load_perf
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
index 5f83aedbc50..ccd91296cf4 100644
--- a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_p
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
index 75c180c2cc2..a5cdb483f71 100644
--- a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_p
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
index 0761177631b..7ad8c0753d9 100644
--- a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secur
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: static_analysis
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
index 7a9ea8e9467..d607bffb157 100644
--- a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
+++ b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_qualys_iac_security_mon
 description: ""
 product_section: ""
 product_stage: ""
-product_group: ""
+product_group: static_analysis
 value_type: number
 status: active
 milestone: "14.7"
diff --git a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
index 407ab183d3c..c00e0598c4a 100644
--- a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_load_performance
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
index 5341e78877b..f9d2202bbaf 100644
--- a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
+++ b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_accessibility_we
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
index 53104524987..e67fc3a12ec 100644
--- a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_failfast_weekly
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
index 8b75aa27857..0ead91ca7d8 100644
--- a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
+++ b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performa
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
index b87657c5af2..3ca9e2b025d 100644
--- a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performa
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
index c4491d08304..fcd5111a50e 100644
--- a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secure_binarie
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: static_analysis
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
index df2b7395e18..2cb5bcf5826 100644
--- a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_load_performance_t
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
index e4eddb4e80e..dbcab54cc69 100644
--- a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_w
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: static_analysis
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
index e4896130935..d0a154b8119 100644
--- a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performanc
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
index 020e9eebb38..a71f1647867 100644
--- a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performanc
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
index 18376dbde05..f392b6feb93 100644
--- a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_load_perf
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
index 77875093c00..4b2c8992046 100644
--- a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_p
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
index b485355d040..b344436d7e1 100644
--- a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_p
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: pipeline_execution
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
index 09c37602d26..fdbfb9407c1 100644
--- a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secur
 description: ''
 product_section: ''
 product_stage: ''
-product_group: ''
+product_group: static_analysis
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
index b0e65aff36b..2d863b3e3f3 100644
--- a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
+++ b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_qualys_iac_security_wee
 description: ""
 product_section: ""
 product_stage: ""
-product_group: ""
+product_group: static_analysis
 value_type: number
 status: active
 milestone: "14.7"
diff --git a/config/routes/development.rb b/config/routes/development.rb
index 34f4eb5556b..6bb91116940 100644
--- a/config/routes/development.rb
+++ b/config/routes/development.rb
@@ -13,4 +13,5 @@ if Rails.env.development?
 
   mount LetterOpenerWeb::Engine, at: '/rails/letter_opener'
   mount Lookbook::Engine, at: '/rails/lookbook'
+  mount Toogle::Engine, at: '/rails/features'
 end
diff --git a/data/whats_new/202403210001_16_10.yml b/data/whats_new/202403210001_16_10.yml
new file mode 100644
index 00000000000..15c5681f5af
--- /dev/null
+++ b/data/whats_new/202403210001_16_10.yml
@@ -0,0 +1,83 @@
+- name: Semantic versioning in the CI/CD catalog
+  description: |
+    To enforce consistent behavior across published components, in GitLab 16.10 we will enforce Semantic versioning for components that are published to the CI/CD catalog. When publishing a component, the tag must follow the 3-digit semantic versioning standard (for example `1.0.0`).
+
+    When using a component with the `include: component` syntax, you should use the published semantic version (`x`, `x.x`. or `x.x.x`). Using `~latest` continues to be supported, but it will always return the latest published version, so you must use it with caution as it could include breaking changes. Shorthand syntax is not supported, but it will be in an upcoming milestone.
+  stage: verify
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/ci/components/#component-versions
+  image_url: https://release-16-10.about.gitlab-review.app/images/16_10/component.png
+  published_at: 2024-03-21
+  release: 16.10
+
+- name: Offload CI traffic to Geo secondaries
+  description: |
+    You can now offload CI runner traffic to Geo secondary sites. Locate runner fleets where they are more convenient and economical to operate and manage, while reducing cross-region traffic. Distribute the load across multiple secondary Geo sites. Reduce load on the primary site, reserving resources for serving developer traffic. After this setup, the developer experience is transparent and seamless. Developer workflows for the setup and configuration of jobs remain unchanged.
+  stage: systems
+  self-managed: true
+  gitlab-com: false
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/administration/geo/secondary_proxy/runners.html
+  image_url: https://release-16-10.about.gitlab-review.app/images/16_10/systems_geo_runner_acceleration.png
+  published_at: 2024-03-21
+  release: 16.10
+
+- name: Wiki templates
+  description: |
+    This version of GitLab introduces all-new templates to the Wiki. Now, you can create templates to streamline creating new pages or modifying existing ones. Templates are wiki pages that are stored in the templates directory in the wiki repository.
+
+    With this enhancement, you can make your wiki page layouts more consistent, create or restructure pages faster, and ensure that information is presented clearly and coherently in your knowledge base.
+  stage: plan
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/project/wiki/index.html#wiki-page-templates
+  image_url: https://release-16-10.about.gitlab-review.app/images/16_10/wiki_templates.gif
+  published_at: 2024-03-21
+  release: 16.10
+
+- name: New ClickHouse integration for high-performance DevOps Analytics
+  description: |
+    The [Contribution Analytics report](https://docs.gitlab.com/ee/user/group/contribution_analytics/) is now more performant and backed by an advanced analytics database using [ClickHouse](https://docs.gitlab.com/ee/architecture/blueprints/clickhouse_usage/#summary) on GitLab.com. This upgrade set the foundation for new extensive analytics and reporting features, allowing us to deliver high-performance analytics aggregations, filtering, and slicing across multiple dimensions. Support for self-managed customers to be able to add to this capability is proposed in [issue 441626](https://gitlab.com/gitlab-org/gitlab/-/issues/441626).
+
+    Although ClickHouse enhances GitLab's analytics capabilities, it's not meant to replace PostgreSQL or Redis, and the existing capabilities remain unchanged.
+  stage: plan
+  self-managed: false
+  gitlab-com: true
+  available_in: [Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/group/contribution_analytics/
+  image_url: https://release-16-10.about.gitlab-review.app/images/16_10/ca_ch16.10_2.png
+  published_at: 2024-03-21
+  release: 16.10
+
+- name: GitLab Duo access governance control
+  description: |
+    Generative AI is revolutionizing work processes, and you can now facilitate the adoption of these technologies without compromising privacy, compliance, or intellectual property (IP) protections.
+
+    You can now disable GitLab Duo AI features for a project, a group, or an instance by using the API. You can then enable GitLab Duo for specific projects or groups when you're ready. These changes are part of a suite of expected work to make AI features more granular to control.
+  stage: ai-powered
+  self-managed: true
+  gitlab-com: true
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/ai_features.html#disable-gitlab-duo-features
+  image_url: https://release-16-10.about.gitlab-review.app/images/16_10/Turn-off-GitLab-Duo-features.png
+  published_at: 2024-03-21
+  release: 16.10
+
+- name: GitLab Pages and Advanced Search available on GitLab Dedicated
+  description: |
+    [GitLab Pages](https://docs.gitlab.com/ee/user/project/pages/) and [Advanced Search](https://docs.gitlab.com/ee/user/search/advanced_search.html) have been enabled for all [GitLab Dedicated instances](https://about.gitlab.com/dedicated/). These features are included in your GitLab Dedicated subscription.
+
+    Advanced Search enables faster, more efficient search across your entire GitLab Dedicated instance. All capabilities of Advanced Search can be used with GitLab Dedicated instances.
+
+    With GitLab Pages, you can publish static websites directly from a repository in GitLab Dedicated. Some capabilities of Pages are [not yet available](https://docs.gitlab.com/ee/subscriptions/gitlab_dedicated/#gitlab-pages) for GitLab Dedicated instances.
+  stage: platforms
+  self-managed: false
+  gitlab-com: true
+  available_in: [Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/subscriptions/gitlab_dedicated/#available-features
+  image_url: https://release-16-10.about.gitlab-review.app/images/16_10/gitlab-dedicated.png
+  published_at: 2024-03-21
+  release: 16.10
diff --git a/doc/administration/monitoring/prometheus/web_exporter.md b/doc/administration/monitoring/prometheus/web_exporter.md
index 7cb4e8ceefe..f5486a5c85c 100644
--- a/doc/administration/monitoring/prometheus/web_exporter.md
+++ b/doc/administration/monitoring/prometheus/web_exporter.md
@@ -82,4 +82,4 @@ The metrics server cannot serve both HTTP and HTTPS at the same time.
 
 When running [GitLab in Docker](../../../install/docker.md), your container might run out of space. This can happen if you enable certain features which increase your space consumption, for example Web Exporter.
 
-To work around this issue, [update your `shm-size`](../../../install/docker.md#devshm-mount-not-having-enough-space-in-docker-container).
+To work around this issue, [update your `shm-size`](../../../install/docker_troubleshooting.md#devshm-mount-not-having-enough-space-in-docker-container).
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index c4711d4865c..1b969a3b6d8 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -2676,15 +2676,57 @@ Get a single merge request diff version.
 GET /projects/:id/merge_requests/:merge_request_iid/versions/:version_id
 ```
 
+Supported attributes:
+
 | Attribute           | Type    | Required | Description                               |
 |---------------------|---------|----------|-------------------------------------------|
-| `id`                | String  | Yes      | The ID of the project.                    |
-| `merge_request_iid` | integer | Yes      | The internal ID of the merge request.     |
-| `version_id`        | integer | Yes      | The ID of the merge request diff version. |
+| `id`                | String  | Yes      | ID of the project.                    |
+| `merge_request_iid` | integer | Yes      | Internal ID of the merge request.     |
+| `version_id`        | integer | Yes      | ID of the merge request diff version. |
 | `unidiff`           | boolean | No       | Present diffs in the [unified diff](https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html) format. Default is false. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130610) in GitLab 16.5.      |
 
-For an explanation of the SHAs in the response,
-see [SHAs in the API response](#shas-in-the-api-response).
+If successful, returns [`200 OK`](rest/index.md#status-codes) and the following
+response attributes:
+
+| Attribute                     | Type         | Description |
+|-------------------------------|--------------|-------------|
+| `id`                          | integer      | ID of the merge request diff version. |
+| `base_commit_sha`             | string       | Merge-base commit SHA between the source branch and the target branches. |
+| `commits`                     | object array | Commits in the merge request diff. |
+| `commits[].id`                | string       | ID of the commit. |
+| `commits[].short_id`          | string       | Short ID of the commit. |
+| `commits[].created_at`        | datetime     | Identical to the `committed_date` field. |
+| `commits[].parent_ids`        | array        | IDs of the parent commits. |
+| `commits[].title`             | string       | Commit title. |
+| `commits[].message`           | string       | Commit message. |
+| `commits[].author_name`       | string       | Commit author's name. |
+| `commits[].author_email`      | string       | Commit author's email address. |
+| `commits[].authored_date`     | datetime     | Commit authored date. |
+| `commits[].committer_name`    | string       | Committer's name. |
+| `commits[].committer_email`   | string       | Committer's email address. |
+| `commits[].committed_date`    | datetime     | Commit date. |
+| `commits[].trailers`          | object       | Git trailers that were parsed for the commit. Duplicate keys include the last value only. |
+| `commits[].extended_trailers` | object       | Git trailers that were parsed for the commit. |
+| `commits[].web_url`           | string       | Web URL of the merge request. |
+| `created_at`                  | datetime     | Timestamp of when the merge request was created. |
+| `diffs`                       | object array | Diffs in the merge request diff version. |
+| `diffs[].diff`                | string       | Content of the diff. |
+| `diffs[].new_path`            | string       | New path of the file. |
+| `diffs[].old_path`            | string       | Old path of the file. |
+| `diffs[].a_mode`              | string       | Old file mode of the file. |
+| `diffs[].b_mode`              | string       | New file mode of the file. |
+| `diffs[].new_file`            | boolean      | Indicates if the file has just been added. |
+| `diffs[].renamed_file`        | boolean      | Indicates if the file has been renamed. |
+| `diffs[].deleted_file`        | boolean      | Indicates if the file has been removed. |
+| `diffs[].generated_file`      | boolean      | Indicates if the file is [marked as generated](../user/project/merge_requests/changes.md#collapse-generated-files). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141576) in GitLab 16.9. |
+| `head_commit_sha`             | string       | HEAD commit of the source branch. |
+| `merge_request_id`            | integer      | ID of the merge request. |
+| `patch_id_sha`                | string       | [Patch ID](https://git-scm.com/docs/git-patch-id) for the merge request diff. |
+| `real_size`                   | string       | Number of changes in the merge request diff. |
+| `start_commit_sha`            | string       | HEAD commit SHA of the target branch when this version of the diff was created. |
+| `state`                       | string       | State of the merge request diff. Can be `collected`, `overflow`, `without_files`. Deprecated values: `timeout`, `overflow_commits_safe_size`, `overflow_diff_files_limit`, `overflow_diff_lines_limit`. |
+
+Example request:
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" \
@@ -2707,27 +2749,51 @@ Example response:
   "commits": [{
     "id": "33e2ee8579fda5bc36accc9c6fbd0b4fefda9e30",
     "short_id": "33e2ee85",
+    "parent_ids": [],
     "title": "Change year to 2018",
     "author_name": "Administrator",
     "author_email": "admin@example.com",
+    "authored_date": "2016-07-26T17:44:29.000+03:00",
+    "committer_name": "Administrator",
+    "committer_email": "admin@example.com",
+    "committed_date": "2016-07-26T17:44:29.000+03:00",
     "created_at": "2016-07-26T17:44:29.000+03:00",
-    "message": "Change year to 2018"
+    "message": "Change year to 2018",
+    "trailers": {},
+    "extended_trailers": {},
+    "web_url": "https://gitlab.example.com/project/-/commit/33e2ee8579fda5bc36accc9c6fbd0b4fefda9e30"
   }, {
     "id": "aa24655de48b36335556ac8a3cd8bb521f977cbd",
     "short_id": "aa24655d",
+    "parent_ids": [],
     "title": "Update LICENSE",
     "author_name": "Administrator",
     "author_email": "admin@example.com",
+    "authored_date": "2016-07-25T17:21:53.000+03:00",
+    "committer_name": "Administrator",
+    "committer_email": "admin@example.com",
+    "committed_date": "2016-07-25T17:21:53.000+03:00",
     "created_at": "2016-07-25T17:21:53.000+03:00",
-    "message": "Update LICENSE"
+    "message": "Update LICENSE",
+    "trailers": {},
+    "extended_trailers": {},
+    "web_url": "https://gitlab.example.com/project/-/commit/aa24655de48b36335556ac8a3cd8bb521f977cbd"
   }, {
     "id": "3eed087b29835c48015768f839d76e5ea8f07a24",
     "short_id": "3eed087b",
+    "parent_ids": [],
     "title": "Add license",
     "author_name": "Administrator",
     "author_email": "admin@example.com",
+    "authored_date": "2016-07-25T17:21:20.000+03:00",
+    "committer_name": "Administrator",
+    "committer_email": "admin@example.com",
+    "committed_date": "2016-07-25T17:21:20.000+03:00",
     "created_at": "2016-07-25T17:21:20.000+03:00",
-    "message": "Add license"
+    "message": "Add license",
+    "trailers": {},
+    "extended_trailers": {},
+    "web_url": "https://gitlab.example.com/project/-/commit/3eed087b29835c48015768f839d76e5ea8f07a24"
   }],
   "diffs": [{
     "old_path": "LICENSE",
@@ -2737,7 +2803,8 @@ Example response:
     "diff": "@@ -0,0 +1,21 @@\n+The MIT License (MIT)\n+\n+Copyright (c) 2018 Administrator\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n",
     "new_file": true,
     "renamed_file": false,
-    "deleted_file": false
+    "deleted_file": false,
+    "generated_file": false
   }]
 }
 ```
diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md
index ddd39f2ac63..7efdee7d5f7 100644
--- a/doc/ci/components/index.md
+++ b/doc/ci/components/index.md
@@ -513,7 +513,7 @@ When using CI/CD variables in a component, evaluate if the `inputs` keyword
 should be used instead. Avoid asking users to define custom variables to configure
 components when `inputs` is a better solution.
 
-Inputs are explicitly defined in the component's specs, and have better validation than variables.
+Inputs are explicitly defined in the component's `spec` section, and have better validation than variables.
 For example, if a required input is not passed to the component, GitLab returns a pipeline error.
 By contrast, if a variable is not defined, its value is empty, and there is no error.
 
diff --git a/doc/ci/triggers/index.md b/doc/ci/triggers/index.md
index 82821c648e3..90650b536df 100644
--- a/doc/ci/triggers/index.md
+++ b/doc/ci/triggers/index.md
@@ -19,9 +19,11 @@ For example, as part of a migration from [Jenkins](../migration/jenkins.md) or [
 
 When authenticating with the API, you can use:
 
-- A [pipeline trigger token](#create-a-pipeline-trigger-token) to trigger a branch or tag pipeline.
+- A [pipeline trigger token](#create-a-pipeline-trigger-token) to trigger a branch or tag pipeline
+  with the [pipeline triggers API endpoint](../../api/pipeline_triggers.md).
 - A [CI/CD job token](../jobs/ci_job_token.md) to [trigger a multi-project pipeline](../pipelines/downstream_pipelines.md#trigger-a-multi-project-pipeline-by-using-the-api).
-- A [personal access token](../../user/profile/personal_access_tokens.md).
+- Another [token with API access](../../security/token_overview.md) to create a new pipeline
+  with the [project pipeline API endpoint](../../api/pipelines.md#create-a-new-pipeline).
 
 ## Create a pipeline trigger token
 
@@ -57,7 +59,7 @@ pipelines with a tool that can access the API, or a webhook.
 
 ### Use cURL
 
-You can use cURL to trigger pipelines with the [pipeline trigger token API endpoint](../../api/pipeline_triggers.md).
+You can use cURL to trigger pipelines with the [pipeline triggers API endpoint](../../api/pipeline_triggers.md).
 For example:
 
 - Use a multiline cURL command:
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index ee8d482010b..4cd33532cc6 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -824,7 +824,7 @@ Use the interpolation format `$[[ input.input-id ]]` to reference the values out
 Inputs are evaluated and interpolated when the configuration is fetched during pipeline creation, but before the
 configuration is merged with the contents of the `.gitlab-ci.yml` file.
 
-**Keyword type**: Header keyword. `specs` must be declared at the top of the configuration file,
+**Keyword type**: Header keyword. `spec` must be declared at the top of the configuration file,
 in a header section.
 
 **Possible inputs**: A hash of strings representing the expected inputs.
@@ -864,7 +864,7 @@ Inputs are mandatory when included, unless you set a default value with `spec:in
 
 Use `default: ''` to have no default value.
 
-**Keyword type**: Header keyword. `specs` must be declared at the top of the configuration file,
+**Keyword type**: Header keyword. `spec` must be declared at the top of the configuration file,
 in a header section.
 
 **Possible inputs**: A string representing the default value, or `''`.
@@ -906,7 +906,7 @@ Use `description` to give a description to a specific input. The description doe
 not affect the behavior of the input and is only used to help users of the file
 understand the input.
 
-**Keyword type**: Header keyword. `specs` must be declared at the top of the configuration file,
+**Keyword type**: Header keyword. `spec` must be declared at the top of the configuration file,
 in a header section.
 
 **Possible inputs**: A string representing the description.
@@ -930,7 +930,7 @@ spec:
 Inputs can use `options` to specify a list of allowed values for an input.
 The limit is 50 options per input.
 
-**Keyword type**: Header keyword. `specs` must be declared at the top of the configuration file,
+**Keyword type**: Header keyword. `spec` must be declared at the top of the configuration file,
 in a header section.
 
 **Possible inputs**: An array of input options.
@@ -968,7 +968,7 @@ In this example:
 
 Use `spec:inputs:regex` to specify a regular expression that the input must match.
 
-**Keyword type**: Header keyword. `specs` must be declared at the top of the configuration file,
+**Keyword type**: Header keyword. `spec` must be declared at the top of the configuration file,
 in a header section.
 
 **Possible inputs**: Must be a regular expression that starts and ends with the `/` character.
@@ -998,7 +998,7 @@ An input of `v1.A.B` does not match the regular expression and fails validation.
 By default, inputs expect strings. Use `spec:inputs:type` to set a different required
 type for inputs.
 
-**Keyword type**: Header keyword. `specs` must be declared at the top of the configuration file,
+**Keyword type**: Header keyword. `spec` must be declared at the top of the configuration file,
 in a header section.
 
 **Possible inputs**: Can be one of:
@@ -4348,20 +4348,20 @@ build-prod:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script: echo "Default branch, so building prod version..."
 
-specs:
+tests:
   stage: test
   needs: ['build-dev']
   rules:
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
       needs: ['build-prod']
     - when: on_success # Run the job in other cases
-  script: echo "Running dev specs by default, or prod specs when default branch..."
+  script: echo "Running tests for dev by default, or prod when default branch..."
 ```
 
 In this example:
 
-- If the pipeline runs on a branch that is not the default branch, the `specs` job needs the `build-dev` job (default behavior).
-- If the pipeline runs on the default branch, and therefore the rule matches the condition, the `specs` job needs the `build-prod` job instead.
+- If the pipeline runs on a branch that is not the default branch, the `tests` job needs the `build-dev` job (default behavior).
+- If the pipeline runs on the default branch, and therefore the rule matches the condition, the `tests` job needs the `build-prod` job instead.
 
 **Additional details**:
 
diff --git a/doc/development/database/database_lab.md b/doc/development/database/database_lab.md
index 35711b46a04..2734756d7a2 100644
--- a/doc/development/database/database_lab.md
+++ b/doc/development/database/database_lab.md
@@ -133,73 +133,25 @@ For information on testing migrations, review our
 NOTE:
 You must have `AllFeaturesUser` [`psql` access](#access-database-lab-engine) to access the console with `psql`.
 
-#### Simplified access through `pgai` Ruby gem
+To access the database lab instances, you must:
 
-[@mbobin](https://gitlab.com/mbobin) created the [`pgai` Ruby Gem](https://gitlab.com/mbobin/pgai/#pgai) that
-greatly simplifies access to a database clone, with support for:
+- File an [access request](https://handbook.gitlab.com/handbook/business-technology/end-user-services/onboarding-access-requests/access-requests/#individual-or-bulk-access-request).
+- Have a user data bag entry in [chef-repo](https://gitlab.com/gitlab-com/gl-infra/chef-repo) with your SSH key and the `db-lab` role.
+- Configure `ssh` as follows:
 
-- Access to all database clones listed in the [Postgres.ai instances page](https://console.postgres.ai/gitlab/instances);
-- Multiple `psql` sessions on the same clone.
+```plaintext
+Host lb-bastion.db-lab.gitlab.com
+  User ${USER}
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/ed25519
 
-If you have `AllFeaturesUser` [`psql` access](#access-database-lab-engine), you can follow the steps below to configure
-the `pgai` Gem:
-
-1. To get started, you need to gather some values from the [Postgres.ai instances page](https://console.postgres.ai/gitlab/instances):
-
-   1. Go to the instance that you want to configure and the on right side of the screen.
-   1. Under **Connection**, select **Connect**. The menu might be collapsed.
-
-      A dialog with everything that's needed for configuration appears, using this format:
-
-      ```shell
-      dblab init --url "http://127.0.0.1:1234" --token TOKEN --environment-id <environment-id>
-      ```
-
-      ```shell
-      ssh -NTML 1234:localhost:<environment-port> <postgresai-user>@<postgresai-proxy> -i ~/.ssh/id_rsa
-      ```
-
-1. Add the following snippet to your SSH configuration file at `~/.ssh/config`, replacing the variable values:
-
-   ```plaintext
-   Host pgai-proxy
-     HostName <postgresai-proxy>
-     User <postgresai-user>
-     IdentityFile ~/.ssh/id_ed25519
-   ```
-
-1. Run the following command so you can accept the server key fingerprint:
-
-   ```shell
-   ssh pgai-proxy
-   ```
-
-1. Run the following commands:
-
-   ```shell
-   gem install pgai
-
-   # Grab an access token: https://console.postgres.ai/gitlab/tokens
-   # GITLAB_USER is your GitLab handle
-   pgai config --dbname=gitlabhq_dblab --prefix=$GITLAB_USER --proxy=pgai-proxy
-
-   # Grab the respective port values from https://console.postgres.ai/gitlab/instances
-   # for the instances you'll be using (in this case, for the `main` database instance)
-   pgai env add --alias main --id <environment-id> --port <environment-port>
-   ```
-
-1. Once this one-time configuration is done, you can use `pgai connect` to connect to a particular database. For
-   instance, to connect to the `main` database:
-
-   ```shell
-   pgai connect main
-   ```
-
-1. Once done with the clone, you can destroy it:
-
-   ```shell
-   pgai destroy main
-   ```
+Host *.gitlab-db-lab.internal
+  User ${USER}
+  PreferredAuthentications publickey
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/ed25519
+  ProxyCommand ssh lb-bastion.db-lab.gitlab.com -W %h:%p
+```
 
 #### Manual access through the Postgres.ai instances page
 
@@ -211,7 +163,7 @@ To connect to a clone using `psql`:
 1. Create a clone from the [desired instance](https://console.postgres.ai/gitlab/instances/).
    1. Provide a **Clone ID**: Something that uniquely identifies your clone, such as `yourname-testing-gitlabissue`.
    1. Provide a **Database username** and **Database password**: Connects `psql` to your clone.
-   1. Select **Enable deletion protection** if you want to preserve your clone. Avoid selecting this option.
+   1. Select **Enable deletion protection** if you need to preserve your clone. Avoid selecting this option.
       Clones are removed after 12 hours.
 1. In the **Clone details** page of the Postgres.ai web interface, copy and run
    the command to start SSH port forwarding for the clone.
@@ -220,3 +172,10 @@ To connect to a clone using `psql`:
 
 After you connect, use clone like you would any `psql` console in production, but with
 the added benefit and safety of an isolated writeable environment.
+
+#### Simplified access through `pgai` Ruby gem
+
+WARNING:
+The `pgai` gem has not yet been updated to use the new database lab instances so you will only be able to access the legacy instance using this tool.
+
+For instructions on using the `pgai` Ruby gem, see: [Database Lab access using the pgai Ruby gem](database_lab_pgai.md).
diff --git a/doc/development/database/database_lab_pgai.md b/doc/development/database/database_lab_pgai.md
new file mode 100644
index 00000000000..9061f1a7cb3
--- /dev/null
+++ b/doc/development/database/database_lab_pgai.md
@@ -0,0 +1,76 @@
+---
+stage: Data Stores
+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.
+---
+
+# Database Lab access using the `pgai` Ruby gem
+
+WARNING:
+The `pgai` gem has not yet been updated to use the new database lab instances so you will only be able to access `gitlab-production-main` and `gitlab-production-ci` using this tool.
+
+[@mbobin](https://gitlab.com/mbobin) created the [`pgai` Ruby Gem](https://gitlab.com/mbobin/pgai/#pgai) that
+greatly simplifies access to a database clone, with support for:
+
+- Access to all database clones listed in the [Postgres.ai instances page](https://console.postgres.ai/gitlab/instances);
+- Multiple `psql` sessions on the same clone.
+
+If you have `AllFeaturesUser` [`psql` access](database_lab.md#access-database-lab-engine),
+you can follow the steps below to configure the `pgai` Gem:
+
+1. To get started, you need to gather some values from the [Postgres.ai instances page](https://console.postgres.ai/gitlab/instances):
+
+   1. Go to the instance that you want to configure and the on right side of the screen.
+   1. Under **Connection**, select **Connect**. The menu might be collapsed.
+
+      A dialog with everything that's needed for configuration appears, using this format:
+
+      ```shell
+      dblab init --url "http://127.0.0.1:1234" --token TOKEN --environment-id <environment-id>
+      ```
+
+      ```shell
+      ssh -NTML 1234:localhost:<environment-port> <postgresai-user>@<postgresai-proxy> -i ~/.ssh/id_rsa
+      ```
+
+1. Add the following snippet to your SSH configuration file at `~/.ssh/config`, replacing the variable values:
+
+   ```plaintext
+   Host pgai-proxy
+     HostName <postgresai-proxy>
+     User <postgresai-user>
+     IdentityFile ~/.ssh/id_ed25519
+   ```
+
+1. Run the following command so you can accept the server key fingerprint:
+
+   ```shell
+   ssh pgai-proxy
+   ```
+
+1. Run the following commands:
+
+   ```shell
+   gem install pgai
+
+   # Grab an access token: https://console.postgres.ai/gitlab/tokens
+   # GITLAB_USER is your GitLab handle
+   pgai config --dbname=gitlabhq_dblab --prefix=$GITLAB_USER --proxy=pgai-proxy
+
+   # Grab the respective port values from https://console.postgres.ai/gitlab/instances
+   # for the instances you'll be using (in this case, for the `main` database instance)
+   pgai env add --alias main --id <environment-id> --port <environment-port>
+   ```
+
+1. Once this one-time configuration is done, you can use `pgai connect` to connect to a particular database. For
+   instance, to connect to the `main` database:
+
+   ```shell
+   pgai connect main
+   ```
+
+1. Once done with the clone, you can destroy it:
+
+   ```shell
+   pgai destroy main
+   ```
diff --git a/doc/install/docker.md b/doc/install/docker.md
index c05cc44b6de..1a08d3046e8 100644
--- a/doc/install/docker.md
+++ b/doc/install/docker.md
@@ -4,7 +4,7 @@ group: Distribution
 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
 ---
 
-# Install GitLab using Docker
+# Install GitLab by using Docker
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
@@ -700,150 +700,3 @@ docker exec -t <container name> gitlab-backup create SKIP=artifacts,repositories
 
 The backup is written to `/var/opt/gitlab/backups` which should be on a
 [volume mounted by Docker](#set-up-the-volumes-location).
-
-## Troubleshooting
-
-The following information will help if you encounter problems with an installation that used the Linux package and Docker.
-
-### Diagnose potential problems
-
-Read container logs:
-
-```shell
-sudo docker logs gitlab
-```
-
-Enter running container:
-
-```shell
-sudo docker exec -it gitlab /bin/bash
-```
-
-From within the container you can administer the GitLab container as you would
-usually administer a [Linux package installation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md).
-
-### 500 Internal Error
-
-When updating the Docker image you may encounter an issue where all paths
-display a `500` page. If this occurs, restart the container to try to rectify the
-issue:
-
-```shell
-sudo docker restart gitlab
-```
-
-### Permission problems
-
-When updating from older GitLab Docker images you might encounter permission
-problems. This happens when users in previous images were not
-preserved correctly. There's script that fixes permissions for all files.
-
-To fix your container, execute `update-permissions` and restart the
-container afterwards:
-
-```shell
-sudo docker exec gitlab update-permissions
-sudo docker restart gitlab
-```
-
-### Windows/Mac: `Error executing action run on resource ruby_block[directory resource: /data/GitLab]`
-
-This error occurs when using Docker Toolbox with VirtualBox on Windows or Mac,
-and making use of Docker volumes. The `/c/Users` volume is mounted as a
-VirtualBox Shared Folder, and does not support the all POSIX file system features.
-The directory ownership and permissions cannot be changed without remounting, and
-GitLab fails.
-
-Our recommendation is to switch to using the native Docker install for your
-platform, instead of using Docker Toolbox.
-
-If you cannot use the native Docker install (Windows 10 Home Edition, or Windows 7/8),
-then an alternative solution is to setup NFS mounts instead of VirtualBox shares for
-Docker Toolbox's boot2docker.
-
-### Linux ACL issues
-
-If you are using file ACLs on the Docker host, the `docker` group requires full access to the volumes in order for GitLab to work:
-
-```shell
-getfacl $GITLAB_HOME
-
-# file: $GITLAB_HOME
-# owner: XXXX
-# group: XXXX
-user::rwx
-group::rwx
-group:docker:rwx
-mask::rwx
-default:user::rwx
-default:group::rwx
-default:group:docker:rwx
-default:mask::rwx
-default:other::r-x
-```
-
-If these are not correct, set them with:
-
-```shell
-sudo setfacl -mR default:group:docker:rwx $GITLAB_HOME
-```
-
-The default group is `docker`. If you changed the group, be sure to update your
-commands.
-
-### `/dev/shm` mount not having enough space in Docker container
-
-GitLab comes with a Prometheus metrics endpoint at `/-/metrics` to expose a
-variety of statistics on the health and performance of GitLab. The files
-required for this gets written to a temporary file system (like `/run` or
-`/dev/shm`).
-
-By default, Docker allocates 64 MB to the shared memory directory (mounted at
-`/dev/shm`). This is insufficient to hold all the Prometheus metrics related
-files generated, and will generate error logs like the following:
-
-```plaintext
-writing value to /dev/shm/gitlab/sidekiq/gauge_all_sidekiq_0-1.db failed with unmapped file
-writing value to /dev/shm/gitlab/sidekiq/gauge_all_sidekiq_0-1.db failed with unmapped file
-writing value to /dev/shm/gitlab/sidekiq/gauge_all_sidekiq_0-1.db failed with unmapped file
-writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
-writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
-writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
-writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
-```
-
-Other than disabling the Prometheus Metrics from the Admin Area, the recommended
-solution to fix this problem is to increase the size of shared memory to at least 256 MB.
-If using `docker run`, this can be done by passing the flag `--shm-size 256m`.
-If using a `docker-compose.yml` file, the `shm_size` key can be used for this
-purpose.
-
-### Docker containers exhausts space due to the `json-file`
-
-Docker uses the [`json-file` default logging driver](https://docs.docker.com/config/containers/logging/configure/#configure-the-default-logging-driver), which performs no log rotation by default. As a result of this lack of rotation, log files stored by the `json-file` driver can consume a significant amount of disk space for containers that generate a lot of output. This can lead to disk space exhaustion. To address this, use [`journald`](https://docs.docker.com/config/containers/logging/journald/) as the logging driver when available, or [another supported driver](https://docs.docker.com/config/containers/logging/configure/#supported-logging-drivers) with native rotation support.
-
-### Buffer overflow error when starting Docker
-
-If you receive this buffer overflow error, you should purge old log files in
-`/var/log/gitlab`:
-
-```plaintext
-buffer overflow detected : terminated
-xargs: tail: terminated by signal 6
-```
-
-Removing old log files helps fix the error, and ensures a clean startup of the instance.
-
-### ThreadError can't create Thread Operation not permitted
-
-```plaintext
-can't create Thread: Operation not permitted
-```
-
-This error occurs when running a container built with newer `glibc` versions on a
-[host that doesn't have support for the new clone3 function](https://github.com/moby/moby/issues/42680). In GitLab 16.0 and later, the container image includes
-the Ubuntu 22.04 Linux package which is built with this newer `glibc`.
-
-This problem is fixed with newer container runtime tools like [Docker 20.10.10](https://github.com/moby/moby/pull/42836).
-
-To resolve this issue, update Docker to version 20.10.10 or later.
diff --git a/doc/install/docker_troubleshooting.md b/doc/install/docker_troubleshooting.md
new file mode 100644
index 00000000000..dfd4525d966
--- /dev/null
+++ b/doc/install/docker_troubleshooting.md
@@ -0,0 +1,156 @@
+---
+stage: Systems
+group: Distribution
+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
+---
+
+# Troubleshooting GitLab installations that use Docker
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** Self-managed
+
+When installing GitLab by using Docker, you might encounter the following issues.
+
+## Diagnose potential problems
+
+Read container logs:
+
+```shell
+sudo docker logs gitlab
+```
+
+Enter running container:
+
+```shell
+sudo docker exec -it gitlab /bin/bash
+```
+
+From within the container you can administer the GitLab container as you would
+usually administer a [Linux package installation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md).
+
+## 500 Internal Error
+
+When updating the Docker image you may encounter an issue where all paths
+display a `500` page. If this occurs, restart the container to try to rectify the
+issue:
+
+```shell
+sudo docker restart gitlab
+```
+
+## Permission problems
+
+When updating from older GitLab Docker images you might encounter permission
+problems. This happens when users in previous images were not
+preserved correctly. There's script that fixes permissions for all files.
+
+To fix your container, execute `update-permissions` and restart the
+container afterwards:
+
+```shell
+sudo docker exec gitlab update-permissions
+sudo docker restart gitlab
+```
+
+## Windows/Mac: `Error executing action run on resource ruby_block[directory resource: /data/GitLab]`
+
+This error occurs when using Docker Toolbox with VirtualBox on Windows or Mac,
+and making use of Docker volumes. The `/c/Users` volume is mounted as a
+VirtualBox Shared Folder, and does not support the all POSIX file system features.
+The directory ownership and permissions cannot be changed without remounting, and
+GitLab fails.
+
+Our recommendation is to switch to using the native Docker install for your
+platform, instead of using Docker Toolbox.
+
+If you cannot use the native Docker install (Windows 10 Home Edition, or Windows 7/8),
+then an alternative solution is to setup NFS mounts instead of VirtualBox shares for
+Docker Toolbox's boot2docker.
+
+## Linux ACL issues
+
+If you are using file ACLs on the Docker host, the `docker` group requires full access to the volumes in order for GitLab to work:
+
+```shell
+getfacl $GITLAB_HOME
+
+# file: $GITLAB_HOME
+# owner: XXXX
+# group: XXXX
+user::rwx
+group::rwx
+group:docker:rwx
+mask::rwx
+default:user::rwx
+default:group::rwx
+default:group:docker:rwx
+default:mask::rwx
+default:other::r-x
+```
+
+If these are not correct, set them with:
+
+```shell
+sudo setfacl -mR default:group:docker:rwx $GITLAB_HOME
+```
+
+The default group is `docker`. If you changed the group, be sure to update your
+commands.
+
+## `/dev/shm` mount not having enough space in Docker container
+
+GitLab comes with a Prometheus metrics endpoint at `/-/metrics` to expose a
+variety of statistics on the health and performance of GitLab. The files
+required for this gets written to a temporary file system (like `/run` or
+`/dev/shm`).
+
+By default, Docker allocates 64 MB to the shared memory directory (mounted at
+`/dev/shm`). This is insufficient to hold all the Prometheus metrics related
+files generated, and will generate error logs like the following:
+
+```plaintext
+writing value to /dev/shm/gitlab/sidekiq/gauge_all_sidekiq_0-1.db failed with unmapped file
+writing value to /dev/shm/gitlab/sidekiq/gauge_all_sidekiq_0-1.db failed with unmapped file
+writing value to /dev/shm/gitlab/sidekiq/gauge_all_sidekiq_0-1.db failed with unmapped file
+writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
+writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
+writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
+writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
+```
+
+Other than disabling the Prometheus Metrics from the Admin Area, the recommended
+solution to fix this problem is to increase the size of shared memory to at least 256 MB.
+If using `docker run`, this can be done by passing the flag `--shm-size 256m`.
+If using a `docker-compose.yml` file, the `shm_size` key can be used for this
+purpose.
+
+## Docker containers exhausts space due to the `json-file`
+
+Docker uses the [`json-file` default logging driver](https://docs.docker.com/config/containers/logging/configure/#configure-the-default-logging-driver), which performs no log rotation by default. As a result of this lack of rotation, log files stored by the `json-file` driver can consume a significant amount of disk space for containers that generate a lot of output. This can lead to disk space exhaustion. To address this, use [`journald`](https://docs.docker.com/config/containers/logging/journald/) as the logging driver when available, or [another supported driver](https://docs.docker.com/config/containers/logging/configure/#supported-logging-drivers) with native rotation support.
+
+## Buffer overflow error when starting Docker
+
+If you receive this buffer overflow error, you should purge old log files in
+`/var/log/gitlab`:
+
+```plaintext
+buffer overflow detected : terminated
+xargs: tail: terminated by signal 6
+```
+
+Removing old log files helps fix the error, and ensures a clean startup of the instance.
+
+## ThreadError can't create Thread Operation not permitted
+
+```plaintext
+can't create Thread: Operation not permitted
+```
+
+This error occurs when running a container built with newer `glibc` versions on a
+[host that doesn't have support for the new clone3 function](https://github.com/moby/moby/issues/42680). In GitLab 16.0 and later, the container image includes
+the Ubuntu 22.04 Linux package which is built with this newer `glibc`.
+
+This problem is fixed with newer container runtime tools like [Docker 20.10.10](https://github.com/moby/moby/pull/42836).
+
+To resolve this issue, update Docker to version 20.10.10 or later.
diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md
index b2feaeae37c..68c505e86de 100644
--- a/doc/integration/kerberos.md
+++ b/doc/integration/kerberos.md
@@ -376,122 +376,3 @@ When you create a keytab with Advanced Encryption Standard (AES)-only encryption
 1. Right-click the account and select **Properties**.
 1. In **Account Options** on the **Account** tab, select the appropriate AES encryption support checkbox.
 1. Save and close.
-
-## Troubleshooting
-
-### Using Google Chrome with Kerberos authentication against Windows AD
-
-When you use Google Chrome to sign in to GitLab with Kerberos, you must enter your full username. For example, `username@domain.com`.
-
-If you do not enter your full username, the sign-in fails. Check the logs to see the following event message as evidence of this sign-in failure:
-
-```plain
-"message":"OmniauthKerberosController: failed to process Negotiate/Kerberos authentication: gss_accept_sec_context did not return GSS_S_COMPLETE: An unsupported mechanism was requested\nUnknown error"`.
-```
-
-### Test connectivity between the GitLab and Kerberos servers
-
-You can use utilities like [`kinit`](https://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/kinit.html) and [`klist`](https://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/klist.html) to test connectivity between the GitLab server
-and the Kerberos server. How you install these depends on your specific OS.
-
-Use `klist` to see the service principal names (SPN) available in your `keytab` file and the encryption type for each SPN:
-
-```shell
-klist -ke /etc/http.keytab
-```
-
-On an Ubuntu server, the output would look similar to the following:
-
-```shell
-Keytab name: FILE:/etc/http.keytab
-KVNO Principal
----- --------------------------------------------------------------------------
-   3 HTTP/my.gitlab.domain@MY.REALM (des-cbc-crc)
-   3 HTTP/my.gitlab.domain@MY.REALM (des-cbc-md5)
-   3 HTTP/my.gitlab.domain@MY.REALM (arcfour-hmac)
-   3 HTTP/my.gitlab.domain@MY.REALM (aes256-cts-hmac-sha1-96)
-   3 HTTP/my.gitlab.domain@MY.REALM (aes128-cts-hmac-sha1-96)
-```
-
-Use `kinit` in verbose mode to test whether GitLab can use the keytab file to connect to the Kerberos server:
-
-```shell
-KRB5_TRACE=/dev/stdout kinit -kt /etc/http.keytab HTTP/my.gitlab.domain@MY.REALM
-```
-
-This command shows a detailed output of the authentication process.
-
-### Unsupported GSSAPI mechanism
-
-With Kerberos SPNEGO authentication, the browser is expected to send a list of
-mechanisms it supports to GitLab. If it doesn't support any of the mechanisms
-GitLab supports, authentication fails with a message like this in the log:
-
-```plaintext
-OmniauthKerberosController: failed to process Negotiate/Kerberos authentication: gss_accept_sec_context did not return GSS_S_COMPLETE: An unsupported mechanism was requested Unknown error
-```
-
-There are a number of potential causes and solutions for this error message.
-
-#### Kerberos integration not using a dedicated port
-
-GitLab CI/CD doesn't work with a Kerberos-enabled GitLab instance unless the Kerberos integration
-is configured to [use a dedicated port](kerberos.md#http-git-access-with-kerberos-token-passwordless-authentication).
-
-#### Lack of connectivity between client machine and Kerberos server
-
-This is usually seen when the browser is unable to contact the Kerberos server
-directly. It falls back to an unsupported mechanism known as
-[`IAKERB`](https://k5wiki.kerberos.org/wiki/Projects/IAKERB), which tries to use
-the GitLab server as an intermediary to the Kerberos server.
-
-If you're experiencing this error, ensure there is connectivity between the
-client machine and the Kerberos server - this is a prerequisite! Traffic may be
-blocked by a firewall, or the DNS records may be incorrect.
-
-#### `GitLab DNS record is a CNAME record` error
-
-Kerberos fails with this error when GitLab is referenced with a `CNAME` record.
-To resolve this issue, ensure the DNS record for GitLab is an `A` record.
-
-#### Mismatched forward and reverse DNS records for GitLab instance hostname
-
-Another failure mode occurs when the forward and reverse DNS records for the
-GitLab server do not match. Often, Windows clients work in this case while
-Linux clients fail. They use reverse DNS while detecting the Kerberos
-realm. If they get the wrong realm then ordinary Kerberos mechanisms fail,
-so the client falls back to attempting to negotiate `IAKERB`, leading to the
-above error message.
-
-To fix this, ensure that the forward and reverse DNS for your GitLab server
-match. So for instance, if you access GitLab as `gitlab.example.com`, resolving
-to IP address `10.0.2.2`, then `2.2.0.10.in-addr.arpa` must be a `PTR` record for
-`gitlab.example.com`.
-
-#### Missing Kerberos libraries on browser or client machine
-
-Finally, it's possible that the browser or client machine lack Kerberos support
-completely. Ensure that the Kerberos libraries are installed and that you can
-authenticate to other Kerberos services.
-
-### HTTP Basic: Access denied when cloning
-
-```shell
-remote: HTTP Basic: Access denied
-fatal: Authentication failed for '<KRB5 path>'
-```
-
-If you are using Git v2.11 or newer and see the above error when cloning, you can
-set the `http.emptyAuth` Git option to `true` to fix this:
-
-```shell
-git config --global http.emptyAuth true
-```
-
-See also: [Git v2.11 release notes](https://github.com/git/git/blob/master/Documentation/RelNotes/2.11.0.txt#L482-L486)
-
-## Helpful links
-
-- <https://help.ubuntu.com/community/Kerberos>
-- <https://blog.manula.org/2012/04/setting-up-kerberos-server-with-debian.html>
-- <https://www.roguelynn.com/words/explain-like-im-5-kerberos/>
diff --git a/doc/integration/kerberos_troubleshooting.md b/doc/integration/kerberos_troubleshooting.md
new file mode 100644
index 00000000000..215b9aa6fe9
--- /dev/null
+++ b/doc/integration/kerberos_troubleshooting.md
@@ -0,0 +1,130 @@
+---
+stage: Govern
+group: Authentication
+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"
+---
+
+# Troubleshooting GitLab with Kerberos integration
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** Self-managed
+
+When working with GitLab with Kerberos integration, you might encounter the following issues.
+
+## Using Google Chrome with Kerberos authentication against Windows AD
+
+When you use Google Chrome to sign in to GitLab with Kerberos, you must enter your full username. For example, `username@domain.com`.
+
+If you do not enter your full username, the sign-in fails. Check the logs to see the following event message as evidence of this sign-in failure:
+
+```plain
+"message":"OmniauthKerberosController: failed to process Negotiate/Kerberos authentication: gss_accept_sec_context did not return GSS_S_COMPLETE: An unsupported mechanism was requested\nUnknown error"`.
+```
+
+## Test connectivity between the GitLab and Kerberos servers
+
+You can use utilities like [`kinit`](https://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/kinit.html) and [`klist`](https://web.mit.edu/kerberos/krb5-1.12/doc/user/user_commands/klist.html) to test connectivity between the GitLab server
+and the Kerberos server. How you install these depends on your specific OS.
+
+Use `klist` to see the service principal names (SPN) available in your `keytab` file and the encryption type for each SPN:
+
+```shell
+klist -ke /etc/http.keytab
+```
+
+On an Ubuntu server, the output would look similar to the following:
+
+```shell
+Keytab name: FILE:/etc/http.keytab
+KVNO Principal
+---- --------------------------------------------------------------------------
+   3 HTTP/my.gitlab.domain@MY.REALM (des-cbc-crc)
+   3 HTTP/my.gitlab.domain@MY.REALM (des-cbc-md5)
+   3 HTTP/my.gitlab.domain@MY.REALM (arcfour-hmac)
+   3 HTTP/my.gitlab.domain@MY.REALM (aes256-cts-hmac-sha1-96)
+   3 HTTP/my.gitlab.domain@MY.REALM (aes128-cts-hmac-sha1-96)
+```
+
+Use `kinit` in verbose mode to test whether GitLab can use the keytab file to connect to the Kerberos server:
+
+```shell
+KRB5_TRACE=/dev/stdout kinit -kt /etc/http.keytab HTTP/my.gitlab.domain@MY.REALM
+```
+
+This command shows a detailed output of the authentication process.
+
+## Unsupported GSSAPI mechanism
+
+With Kerberos SPNEGO authentication, the browser is expected to send a list of
+mechanisms it supports to GitLab. If it doesn't support any of the mechanisms
+GitLab supports, authentication fails with a message like this in the log:
+
+```plaintext
+OmniauthKerberosController: failed to process Negotiate/Kerberos authentication: gss_accept_sec_context did not return GSS_S_COMPLETE: An unsupported mechanism was requested Unknown error
+```
+
+There are a number of potential causes and solutions for this error message.
+
+### Kerberos integration not using a dedicated port
+
+GitLab CI/CD doesn't work with a Kerberos-enabled GitLab instance unless the Kerberos integration
+is configured to [use a dedicated port](kerberos.md#http-git-access-with-kerberos-token-passwordless-authentication).
+
+### Lack of connectivity between client machine and Kerberos server
+
+This is usually seen when the browser is unable to contact the Kerberos server
+directly. It falls back to an unsupported mechanism known as
+[`IAKERB`](https://k5wiki.kerberos.org/wiki/Projects/IAKERB), which tries to use
+the GitLab server as an intermediary to the Kerberos server.
+
+If you're experiencing this error, ensure there is connectivity between the
+client machine and the Kerberos server - this is a prerequisite! Traffic may be
+blocked by a firewall, or the DNS records may be incorrect.
+
+### `GitLab DNS record is a CNAME record` error
+
+Kerberos fails with this error when GitLab is referenced with a `CNAME` record.
+To resolve this issue, ensure the DNS record for GitLab is an `A` record.
+
+### Mismatched forward and reverse DNS records for GitLab instance hostname
+
+Another failure mode occurs when the forward and reverse DNS records for the
+GitLab server do not match. Often, Windows clients work in this case while
+Linux clients fail. They use reverse DNS while detecting the Kerberos
+realm. If they get the wrong realm then ordinary Kerberos mechanisms fail,
+so the client falls back to attempting to negotiate `IAKERB`, leading to the
+above error message.
+
+To fix this, ensure that the forward and reverse DNS for your GitLab server
+match. So for instance, if you access GitLab as `gitlab.example.com`, resolving
+to IP address `10.0.2.2`, then `2.2.0.10.in-addr.arpa` must be a `PTR` record for
+`gitlab.example.com`.
+
+### Missing Kerberos libraries on browser or client machine
+
+Finally, it's possible that the browser or client machine lack Kerberos support
+completely. Ensure that the Kerberos libraries are installed and that you can
+authenticate to other Kerberos services.
+
+## HTTP Basic: Access denied when cloning
+
+```shell
+remote: HTTP Basic: Access denied
+fatal: Authentication failed for '<KRB5 path>'
+```
+
+If you are using Git v2.11 or newer and see the above error when cloning, you can
+set the `http.emptyAuth` Git option to `true` to fix this:
+
+```shell
+git config --global http.emptyAuth true
+```
+
+See also: [Git v2.11 release notes](https://github.com/git/git/blob/master/Documentation/RelNotes/2.11.0.txt#L482-L486)
+
+## Helpful links
+
+- <https://help.ubuntu.com/community/Kerberos>
+- <https://blog.manula.org/2012/04/setting-up-kerberos-server-with-debian.html>
+- <https://www.roguelynn.com/words/explain-like-im-5-kerberos/>
diff --git a/doc/update/versions/gitlab_16_changes.md b/doc/update/versions/gitlab_16_changes.md
index 72e05bc6731..625b7b69632 100644
--- a/doc/update/versions/gitlab_16_changes.md
+++ b/doc/update/versions/gitlab_16_changes.md
@@ -952,7 +952,7 @@ by this issue.
   every Sidekiq process also listens to those queues to ensure all jobs are processed across
   all queues. This behavior does not apply if you have configured the [routing rules](../../administration/sidekiq/processing_specific_job_classes.md#routing-rules).
 - Docker 20.10.10 or later is required to run the GitLab Docker image. Older versions
-  [throw errors on startup](../../install/docker.md#threaderror-cant-create-thread-operation-not-permitted).
+  [throw errors on startup](../../install/docker_troubleshooting.md#threaderror-cant-create-thread-operation-not-permitted).
 - Container registry using Azure storage might be empty with zero tags. You can fix this by following the [breaking change instructions](../deprecations.md#azure-storage-driver-defaults-to-the-correct-root-prefix).
 
 - Normally, backups in environments that have PgBouncer must [bypass PgBouncer by setting variables that are prefixed with `GITLAB_BACKUP_`](../../administration/backup_restore/backup_gitlab.md#bypassing-pgbouncer). However, due to an [issue](https://gitlab.com/gitlab-org/gitlab/-/issues/422163), `gitlab-backup` uses the regular database connection through PgBouncer instead of the direct connection defined in the override, and the database backup fails. The workaround is to use `pg_dump` directly.
diff --git a/lib/api/group_import.rb b/lib/api/group_import.rb
index 609a7ed0ef0..a0f392ea7c6 100644
--- a/lib/api/group_import.rb
+++ b/lib/api/group_import.rb
@@ -79,9 +79,10 @@ module API
           import_export_upload: ImportExportUpload.new(import_file: params[:file])
         }
 
-        group = ::Groups::CreateService.new(current_user, group_params).execute
+        response = ::Groups::CreateService.new(current_user, group_params).execute
+        group = response[:group]
 
-        if group.persisted?
+        if response.success?
           ::Groups::ImportExport::ImportService.new(group: group, user: current_user).async_execute
 
           accepted!
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 33aafb2b27f..47bf5d427f4 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -62,9 +62,7 @@ module API
       def create_group
         # This is a separate method so that EE can extend its behaviour, without
         # having to modify this code directly.
-        ::Groups::CreateService
-          .new(current_user, declared_params(include_missing: false))
-          .execute
+        ::Groups::CreateService.new(current_user, declared_params(include_missing: false)).execute
       end
 
       def update_group(group)
@@ -244,10 +242,11 @@ module API
           authorize_group_creation!
         end
 
-        group = create_group
+        response = create_group
+        group = response[:group]
         group.preload_shared_group_links
 
-        if group.persisted?
+        if response.success?
           present group, with: Entities::GroupDetail, current_user: current_user
         else
           render_api_error!("Failed to save group #{group.errors.messages}", 400)
diff --git a/lib/bulk_imports/groups/loaders/group_loader.rb b/lib/bulk_imports/groups/loaders/group_loader.rb
index 85d85f0f703..0d3ccb4b85b 100644
--- a/lib/bulk_imports/groups/loaders/group_loader.rb
+++ b/lib/bulk_imports/groups/loaders/group_loader.rb
@@ -22,9 +22,10 @@ module BulkImports
             raise(GroupCreationError, 'User requires Two-Factor Authentication')
           end
 
-          group = ::Groups::CreateService.new(current_user, data).execute
+          response = ::Groups::CreateService.new(current_user, data).execute
+          group = response[:group]
 
-          raise(GroupCreationError, group.errors.full_messages.to_sentence) if group.errors.any?
+          raise(GroupCreationError, group.errors.full_messages.to_sentence) if response.error?
 
           context.entity.update!(group: group)
 
diff --git a/lib/gitlab/ci/config/interpolation/block.rb b/lib/gitlab/ci/config/interpolation/block.rb
index 0c9a83fed1d..e8e64891a96 100644
--- a/lib/gitlab/ci/config/interpolation/block.rb
+++ b/lib/gitlab/ci/config/interpolation/block.rb
@@ -19,14 +19,6 @@ module Gitlab
 
           attr_reader :data, :ctx, :errors
 
-          def self.match(data)
-            return data unless data.is_a?(String) && data.include?(PREFIX)
-
-            data.gsub(PATTERN) do
-              yield ::Regexp.last_match(1), ::Regexp.last_match(2)
-            end
-          end
-
           def initialize(block, data, ctx)
             @block = block
             @data = data
diff --git a/lib/gitlab/ci/config/interpolation/template.rb b/lib/gitlab/ci/config/interpolation/template.rb
index 697be852c81..24788b41140 100644
--- a/lib/gitlab/ci/config/interpolation/template.rb
+++ b/lib/gitlab/ci/config/interpolation/template.rb
@@ -43,39 +43,19 @@ module Gitlab
           def interpolate!
             @result = @config.replace! do |node|
               break if @errors.any?
+              next node unless node_might_contain_interpolation_block?(node)
 
-              if Feature.enabled?(:ci_fix_input_types, Feature.current_request, type: :gitlab_com_derisk)
-                interpolate_with_fixed_types!(node)
-              else
-                legacy_interpolate!(node)
-              end
+              matches = node.scan(BLOCK_PATTERN)
+              next node if matches.empty?
+
+              blocks = interpolate_blocks(matches)
+              break unless @errors.none? && blocks.present?
+
+              get_interpolated_node_content!(node, blocks)
             end
           end
           strong_memoize_attr :interpolate!
 
-          def interpolate_with_fixed_types!(node)
-            return node unless node_might_contain_interpolation_block?(node)
-
-            matches = node.scan(BLOCK_PATTERN)
-            return node if matches.empty?
-
-            blocks = interpolate_blocks(matches)
-            return unless @errors.none? && blocks.present?
-
-            get_interpolated_node_content!(node, blocks)
-          end
-
-          def legacy_interpolate!(node)
-            Interpolation::Block.match(node) do |block, data|
-              block = (@blocks[block] ||= Interpolation::Block.new(block, data, ctx))
-
-              break @errors.push('too many interpolation blocks') if @blocks.size > MAX_BLOCKS
-              break unless block.valid?
-
-              block.value
-            end
-          end
-
           def node_might_contain_interpolation_block?(node)
             node.is_a?(String) && node.include?(BLOCK_PREFIX)
           end
diff --git a/lib/gitlab/import_export/group/tree_restorer.rb b/lib/gitlab/import_export/group/tree_restorer.rb
index 0b92942eb8a..e356ed9bf35 100644
--- a/lib/gitlab/import_export/group/tree_restorer.rb
+++ b/lib/gitlab/import_export/group/tree_restorer.rb
@@ -99,13 +99,14 @@ module Gitlab
 
           parent_group = @groups_mapping.fetch(parent_id) { raise(ArgumentError, 'Parent group not found') }
 
-          group = ::Groups::CreateService.new(
+          result = ::Groups::CreateService.new(
             user,
             name: name,
             path: path,
             parent_id: parent_group.id,
             visibility_level: sub_group_visibility_level(visibility_level, parent_group)
           ).execute
+          group = result[:group]
 
           group.validate!
 
diff --git a/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb b/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb
index 23043fc8652..4a5b9b4ca0d 100644
--- a/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb
+++ b/lib/gitlab/seeders/ci/runner/runner_fleet_seeder.rb
@@ -162,7 +162,7 @@ module Gitlab
           def create_group(**args)
             logger.info(message: 'Creating group', **args)
 
-            ensure_success(::Groups::CreateService.new(@user, **args).execute)
+            ensure_success(::Groups::CreateService.new(@user, **args).execute[:group])
           end
 
           def ensure_project(name:, namespace_id:, **args)
diff --git a/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency.rb b/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency.rb
index fe2deb867ca..b380a51bf7f 100644
--- a/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency.rb
+++ b/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency.rb
@@ -25,7 +25,11 @@ module Gitlab
           private
 
           def workers_uncached
-            sidekiq_workers.map { |_process_id, _thread_id, work| ::Gitlab::Json.parse(work['payload'])['class'] }.tally
+            Gitlab::Redis::Queues.instances.values.flat_map do |instance| # rubocop:disable Cop/RedisQueueUsage -- iterating over instances is allowed as we pass the pool to Sidekiq
+              Sidekiq::Client.via(instance.sidekiq_redis) do
+                sidekiq_workers.map { |_process_id, _thread_id, work| ::Gitlab::Json.parse(work['payload'])['class'] }
+              end
+            end.tally
           end
 
           def sidekiq_workers
diff --git a/lib/sidebars/your_work/menus/milestones_menu.rb b/lib/sidebars/your_work/menus/milestones_menu.rb
index 9b643afeec5..c81c98287ea 100644
--- a/lib/sidebars/your_work/menus/milestones_menu.rb
+++ b/lib/sidebars/your_work/menus/milestones_menu.rb
@@ -16,7 +16,7 @@ module Sidebars
 
         override :sprite_icon
         def sprite_icon
-          'clock'
+          'milestone'
         end
 
         override :render?
diff --git a/lib/tasks/gitlab/seed/group_seed.rake b/lib/tasks/gitlab/seed/group_seed.rake
index c9b901b92c5..a2415a5beac 100644
--- a/lib/tasks/gitlab/seed/group_seed.rake
+++ b/lib/tasks/gitlab/seed/group_seed.rake
@@ -72,7 +72,7 @@ class GroupSeeder
   end
 
   def create_root_group
-    root_group = ::Groups::CreateService.new(@user, group_params).execute
+    root_group = ::Groups::CreateService.new(@user, group_params).execute[:group]
 
     track_group_id(1, root_group.id)
   end
@@ -85,7 +85,7 @@ class GroupSeeder
 
       parent_groups.each do |parent_id|
         @resource_count.times do |_|
-          sub_group = ::Groups::CreateService.new(@user, group_params(parent_id: parent_id)).execute
+          sub_group = ::Groups::CreateService.new(@user, group_params(parent_id: parent_id)).execute[:group]
 
           track_group_id(current_level, sub_group.id)
         end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 84bb0151ef0..fcab4053ad5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2886,9 +2886,6 @@ msgstr ""
 msgid "Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message."
 msgstr ""
 
-msgid "Add a new comment template"
-msgstr ""
-
 msgid "Add a new issue"
 msgstr ""
 
@@ -19000,6 +18997,9 @@ msgstr ""
 msgid "Email a new %{name} to this project"
 msgstr ""
 
+msgid "Email a new issue"
+msgstr ""
+
 msgid "Email address copied"
 msgstr ""
 
@@ -19156,6 +19156,9 @@ msgstr ""
 msgid "Enable Invisible Captcha during sign up"
 msgstr ""
 
+msgid "Enable Jira integration"
+msgstr ""
+
 msgid "Enable Kroki"
 msgstr ""
 
@@ -25910,6 +25913,9 @@ msgstr ""
 msgid "Import and export settings"
 msgstr ""
 
+msgid "Import existing issues"
+msgstr ""
+
 msgid "Import from"
 msgstr ""
 
@@ -29490,6 +29496,9 @@ msgstr ""
 msgid "Learn more about groups."
 msgstr ""
 
+msgid "Learn more about issues"
+msgstr ""
+
 msgid "Learn more about issues."
 msgstr ""
 
@@ -30289,6 +30298,9 @@ msgstr ""
 msgid "Manage git repositories with fine-grained access controls that keep your code secure."
 msgstr ""
 
+msgid "Manage group comment templates"
+msgstr ""
+
 msgid "Manage group labels"
 msgstr ""
 
@@ -30316,6 +30328,9 @@ msgstr ""
 msgid "Manage usage"
 msgstr ""
 
+msgid "Manage your comment templates"
+msgstr ""
+
 msgid "Manage your subscription"
 msgstr ""
 
@@ -41297,6 +41312,9 @@ msgstr ""
 msgid "Read more about GitLab at %{link_to_promo}."
 msgstr ""
 
+msgid "Read our documentation"
+msgstr ""
+
 msgid "Read the documentation before applying changes."
 msgstr ""
 
@@ -51720,6 +51738,9 @@ msgstr ""
 msgid "This feature is only allowed in groups or projects that enable this feature."
 msgstr ""
 
+msgid "This feature is only available on paid plans."
+msgstr ""
+
 msgid "This feature requires local storage to be enabled"
 msgstr ""
 
@@ -57178,6 +57199,9 @@ msgstr ""
 msgid "Wireframe"
 msgstr ""
 
+msgid "With issues you can discuss the implementation of an idea, track tasks and work status, elaborate on code implementations, and accept feature proposals, questions, support requests, or bug reports."
+msgstr ""
+
 msgid "With requirements, you can set criteria to check your products against."
 msgstr ""
 
diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk
index ea4ccefaafc..1fdccec81c6 100644
--- a/qa/gdk/Dockerfile.gdk
+++ b/qa/gdk/Dockerfile.gdk
@@ -1,4 +1,4 @@
-ARG GDK_SHA=58c2c2bb7eb86afdef0d4095b7712d7847fcf79b
+ARG GDK_SHA=6f2d76db0958bb8c2498420471e9f0404833af55
 # Use tag prefix when running on 'stable' branch to make sure 'protected' image is used which is not deleted by registry cleanup
 ARG GDK_BASE_TAG_PREFIX
 
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/auto_devops_templates_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/auto_devops_templates_spec.rb
index 820fde7ad3d..2e64987f605 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/auto_devops_templates_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/auto_devops_templates_spec.rb
@@ -2,7 +2,11 @@
 
 module QA
   RSpec.describe 'Configure' do
-    describe 'AutoDevOps Templates', only: { subdomain: %i[staging staging-canary] }, product_group: :environments do
+    describe 'AutoDevOps Templates', only: { subdomain: %i[staging staging-canary] }, product_group: :environments,
+      quarantine: {
+        issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/432409',
+        type: :test_environment
+      } do
       using RSpec::Parameterized::TableSyntax
 
       # specify jobs to be disabled in the pipeline.
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 85248b6fa6c..a4acdc70699 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -87,10 +87,26 @@ RSpec.describe SessionsController, feature_category: :system_access do
         it 'does not authenticate user' do
           post(:create, params: { user: { login: 'invalid', password: 'invalid' } })
 
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(@request.env['warden']).not_to be_authenticated
           expect(controller).to set_flash.now[:alert].to(/Invalid login or password/)
         end
       end
 
+      context 'when user with LDAP identity' do
+        before do
+          create(:identity, provider: 'ldapmain', user: user)
+        end
+
+        it 'does not authenticate user' do
+          post_action
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(@request.env['warden']).not_to be_authenticated
+          expect(flash[:alert]).to include(I18n.t('devise.failure.invalid'))
+        end
+      end
+
       context 'a blocked user' do
         it 'does not authenticate the user' do
           user.block!
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index c782138639c..c0a3ad98ca4 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -509,15 +509,6 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
         expect(page).not_to have_content(I18n.t('devise.failure.already_authenticated'))
       end
 
-      it 'does not allow LDAP user to sign in with local password' do
-        create(:identity, provider: 'ldapmain', user: user)
-
-        gitlab_sign_in(user)
-
-        expect(page).to have_content(I18n.t('devise.failure.invalid'))
-        expect(user.reload.failed_attempts).to eq(0)
-      end
-
       it 'does not show already signed in message when opening sign in page after login' do
         expect(authentication_metrics)
           .to increment(:user_authenticated_counter)
diff --git a/spec/frontend/boards/mock_data.js b/spec/frontend/boards/mock_data.js
index c2587b17409..c56326f7581 100644
--- a/spec/frontend/boards/mock_data.js
+++ b/spec/frontend/boards/mock_data.js
@@ -787,7 +787,7 @@ export const mockTokens = (fetchLabels, isSignedIn) => [
   },
   ...(isSignedIn ? [mockEmojiToken, mockConfidentialToken] : []),
   {
-    icon: 'clock',
+    icon: 'milestone',
     title: TOKEN_TITLE_MILESTONE,
     symbol: '%',
     type: TOKEN_TYPE_MILESTONE,
diff --git a/spec/frontend/ci/catalog/components/details/ci_resource_header_spec.js b/spec/frontend/ci/catalog/components/details/ci_resource_header_spec.js
index a6974e09bc5..e4d1e2b1aa0 100644
--- a/spec/frontend/ci/catalog/components/details/ci_resource_header_spec.js
+++ b/spec/frontend/ci/catalog/components/details/ci_resource_header_spec.js
@@ -1,7 +1,8 @@
 import { GlAvatar, GlAvatarLink, GlBadge } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import CiResourceHeader from '~/ci/catalog/components/details/ci_resource_header.vue';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
+import CiResourceHeader from '~/ci/catalog/components/details/ci_resource_header.vue';
 import CiResourceAbout from '~/ci/catalog/components/details/ci_resource_about.vue';
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 import { catalogSharedDataMock, catalogAdditionalDetailsMock } from '../../mock';
@@ -21,6 +22,8 @@ describe('CiResourceHeader', () => {
   };
 
   const findAboutComponent = () => wrapper.findComponent(CiResourceAbout);
+  const findReportAbuseButton = () => wrapper.findByTestId('report-abuse-button');
+  const findAbuseCategorySelector = () => wrapper.findComponent(AbuseCategorySelector);
   const findAvatar = () => wrapper.findComponent(GlAvatar);
   const findAvatarLink = () => wrapper.findComponent(GlAvatarLink);
   const findVersionBadge = () => wrapper.findComponent(GlBadge);
@@ -32,6 +35,9 @@ describe('CiResourceHeader', () => {
         ...defaultProps,
         ...props,
       },
+      provide: {
+        reportAbusePath: '/report/abuse/path',
+      },
     });
   };
 
@@ -135,4 +141,54 @@ describe('CiResourceHeader', () => {
       });
     });
   });
+
+  describe('report abuse button', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('does not render the abuse category selector', () => {
+      expect(findReportAbuseButton().exists()).toBe(true);
+      expect(findAbuseCategorySelector().exists()).toBe(false);
+    });
+
+    it('opens the abuse category drawer', async () => {
+      const reportedUrl = window.location.href;
+      await findReportAbuseButton().vm.$emit('action');
+
+      expect(findAbuseCategorySelector().exists()).toBe(true);
+      expect(findAbuseCategorySelector().props()).toMatchObject({
+        showDrawer: true,
+        reportedUserId: 1,
+        reportedFromUrl: reportedUrl,
+      });
+    });
+
+    it('closes the abuse category drawer', async () => {
+      await findReportAbuseButton().vm.$emit('action');
+      expect(findAbuseCategorySelector().exists()).toEqual(true);
+
+      await findAbuseCategorySelector().vm.$emit('close-drawer');
+      expect(findAbuseCategorySelector().exists()).toEqual(false);
+    });
+
+    describe('when user is not active', () => {
+      beforeEach(() => {
+        resource.versions.nodes[0].author.state = 'deleted';
+        createComponent();
+      });
+
+      it('should report with an empty user', async () => {
+        const reportedUrl = window.location.href;
+        await findReportAbuseButton().vm.$emit('action');
+
+        expect(findAbuseCategorySelector().exists()).toBe(true);
+        expect(findAbuseCategorySelector().props()).toMatchObject({
+          showDrawer: true,
+          reportedUserId: 0,
+          reportedFromUrl: reportedUrl,
+        });
+      });
+    });
+  });
 });
diff --git a/spec/frontend/ci/catalog/components/pages/ci_resource_details_page_spec.js b/spec/frontend/ci/catalog/components/pages/ci_resource_details_page_spec.js
index 0a70a066cf1..49fff799efa 100644
--- a/spec/frontend/ci/catalog/components/pages/ci_resource_details_page_spec.js
+++ b/spec/frontend/ci/catalog/components/pages/ci_resource_details_page_spec.js
@@ -159,7 +159,7 @@ describe('CiResourceDetailsPage', () => {
       });
 
       it('passes expected props', () => {
-        expect(findHeaderComponent().props()).toEqual({
+        expect(findHeaderComponent().props()).toMatchObject({
           isLoadingDetails: false,
           isLoadingSharedData: false,
           openIssuesCount: defaultAdditionalData.openIssuesCount,
diff --git a/spec/frontend/ci/catalog/mock.js b/spec/frontend/ci/catalog/mock.js
index 7a652619944..9b8c3a9ab04 100644
--- a/spec/frontend/ci/catalog/mock.js
+++ b/spec/frontend/ci/catalog/mock.js
@@ -395,10 +395,16 @@ export const catalogSinglePageResponse = {
           description: 'A simple component',
           starCount: 0,
           versions: {
+            __typename: 'CiCatalogResourceVersionConnection',
             nodes: [
               {
                 id: 'gid://gitlab/Ci::Catalog::Resources::Version/2',
-                author: { name: 'author', username: 'author-username', webUrl: '/user/1' },
+                author: {
+                  __typename: 'UserCore',
+                  name: 'author',
+                  username: 'author-username',
+                  webUrl: '/user/1',
+                },
                 createdAt: '2024-01-26T19:40:03Z',
                 name: '1.0.0',
                 path: '/root/catalog-component-test/-/tags/1.0.2',
@@ -455,15 +461,22 @@ export const catalogSharedDataMock = {
       starCount: 1,
       starrersPath: '/path/to/project/-/starrers',
       versions: {
+        __typename: 'CiCatalogResourceVersionConnection',
         nodes: [
           {
-            __typename: 'Release',
+            __typename: 'CiCatalogResourceVersion',
             id: '3',
             components: componentsListMockData,
             name: '1.0.0',
             path: 'path/to/release',
             createdAt: Date.now(),
-            author: { id: 1, webUrl: 'profile/1', name: 'username' },
+            author: {
+              __typename: 'UserCore',
+              id: 1,
+              webUrl: 'profile/1',
+              name: 'username',
+              state: 'active',
+            },
           },
         ],
       },
@@ -482,10 +495,10 @@ export const catalogAdditionalDetailsMock = {
       openMergeRequestsCount: 10,
       readmeHtml: '<h1>Hello world</h1>',
       versions: {
-        __typename: 'ReleaseConnection',
+        __typename: 'CiCatalogResourceVersionConnection',
         nodes: [
           {
-            __typename: 'Release',
+            __typename: 'CiCatalogResourceVersion',
             id: 'gid://gitlab/Release/3',
             commit: {
               __typename: 'Commit',
@@ -510,7 +523,7 @@ export const catalogAdditionalDetailsMock = {
             },
             name: '1.0.2',
             path: '/path/to/release',
-            author: { id: 1, webUrl: 'profile/1', name: 'username' },
+            author: { __typename: 'UserCore', id: 1, webUrl: 'profile/1', name: 'username' },
             createdAt: '2022-08-23T17:19:09Z',
           },
         ],
@@ -530,9 +543,10 @@ const generateResourcesNodes = (count = 20, startId = 0) => {
       name: `My component #${i}`,
       starCount: 10,
       versions: {
+        __typename: 'CiCatalogResourceVersionConnection',
         nodes: [
           {
-            __typename: 'Release',
+            __typename: 'CiCatalogResourceVersion',
             id: '3',
             components: {
               ...componentsListMockData,
@@ -540,7 +554,12 @@ const generateResourcesNodes = (count = 20, startId = 0) => {
             name: '1.0.0',
             path: 'path/to/release',
             createdAt: Date.now(),
-            author: { id: 1, webUrl: 'profile/1', name: 'username' },
+            author: {
+              __typename: 'UserCore',
+              id: 1,
+              webUrl: 'profile/1',
+              name: 'username',
+            },
           },
         ],
       },
@@ -560,6 +579,7 @@ export const mockComponents = {
       id: `gid://gitlab/CiCatalogResource/1`,
       webPath: '/twitter/project-1',
       versions: {
+        __typename: 'CiCatalogResourceVersionConnection',
         nodes: [
           {
             id: 'gid://gitlab/Version/1',
@@ -580,6 +600,7 @@ export const mockComponentsEmpty = {
       id: `gid://gitlab/CiCatalogResource/1`,
       webPath: '/twitter/project-1',
       versions: {
+        __typename: 'CiCatalogResourceVersionConnection',
         nodes: [
           {
             id: 'gid://gitlab/Version/1',
diff --git a/spec/frontend/content_editor/components/formatting_toolbar_spec.js b/spec/frontend/content_editor/components/formatting_toolbar_spec.js
index 6562cb517cd..985c22602f4 100644
--- a/spec/frontend/content_editor/components/formatting_toolbar_spec.js
+++ b/spec/frontend/content_editor/components/formatting_toolbar_spec.js
@@ -112,7 +112,7 @@ describe('content_editor/components/formatting_toolbar', () => {
         provide: {
           tiptapEditor,
           contentEditor,
-          newCommentTemplatePath: 'some/path',
+          newCommentTemplatePaths: ['some/path'],
         },
       });
 
diff --git a/spec/frontend/issuable/components/issuable_by_email_spec.js b/spec/frontend/issuable/components/issuable_by_email_spec.js
index 4cc5775b54e..2d9b0b4d047 100644
--- a/spec/frontend/issuable/components/issuable_by_email_spec.js
+++ b/spec/frontend/issuable/components/issuable_by_email_spec.js
@@ -16,7 +16,7 @@ describe('IssuableByEmail', () => {
   let mockAxios;
   let glModalDirective;
 
-  function createComponent(injectedProperties = {}) {
+  function createComponent(injectedProperties = {}, props = {}) {
     glModalDirective = jest.fn();
 
     return extendedWrapper(
@@ -39,6 +39,7 @@ describe('IssuableByEmail', () => {
             show: mockToastShow,
           },
         },
+        propsData: props,
         provide: {
           issuableType: 'issue',
           initialEmail,
@@ -85,6 +86,20 @@ describe('IssuableByEmail', () => {
 
       expect(glModalDirective).toHaveBeenCalled();
     });
+
+    describe('when passing variant and button text', () => {
+      it('renders correct button', () => {
+        const variant = 'default';
+        const text = 'Email a new issue';
+
+        wrapper = createComponent({}, { variant, text });
+
+        const button = findButton();
+
+        expect(button.attributes('variant')).toBe(variant);
+        expect(button.text()).toBe(text);
+      });
+    });
   });
 
   describe('modal', () => {
diff --git a/spec/frontend/issuable/components/issue_milestone_spec.js b/spec/frontend/issuable/components/issue_milestone_spec.js
index 232d6177862..dea98aa32df 100644
--- a/spec/frontend/issuable/components/issue_milestone_spec.js
+++ b/spec/frontend/issuable/components/issue_milestone_spec.js
@@ -16,7 +16,7 @@ describe('IssueMilestone component', () => {
   });
 
   it('renders milestone icon', () => {
-    expect(wrapper.findComponent(GlIcon).props('name')).toBe('clock');
+    expect(wrapper.findComponent(GlIcon).props('name')).toBe('milestone');
   });
 
   it('renders milestone title', () => {
diff --git a/spec/frontend/issues/list/components/empty_state_without_any_issues_experiment_spec.js b/spec/frontend/issues/list/components/empty_state_without_any_issues_experiment_spec.js
new file mode 100644
index 00000000000..64a2cc7c933
--- /dev/null
+++ b/spec/frontend/issues/list/components/empty_state_without_any_issues_experiment_spec.js
@@ -0,0 +1,159 @@
+import { mountExtended } from 'helpers/vue_test_utils_helper';
+import IssuableByEmail from '~/issuable/components/issuable_by_email.vue';
+import EmptyStateWithoutAnyIssuesExperiment from '~/issues/list/components/empty_state_without_any_issues_experiment.vue';
+
+describe('EmptyStateWithoutAnyIssuesExperiment component', () => {
+  let wrapper;
+
+  const defaultProps = {
+    showCsvButtons: true,
+    showIssuableByEmail: true,
+  };
+
+  const defaultProvide = {
+    newIssuePath: 'new/issue/path',
+    showNewIssueLink: true,
+    showImportButton: true,
+    canEdit: true,
+    projectImportJiraPath: 'project/import/jira/path',
+  };
+
+  const findCreateAnIssueVideo = () => wrapper.findByTestId('create-an-issue-iframe-video');
+  const findNewIssueButton = () => wrapper.findByTestId('empty-state-new-issue-btn');
+  const findIssuableByEmail = () => wrapper.findComponent(IssuableByEmail);
+  const findCsvImportButton = () => wrapper.findByTestId('empty-state-import-csv-btn');
+  const findImportFromJiraButton = () => wrapper.findByTestId('empty-state-import-jira-btn');
+
+  const mountComponent = ({ props = {}, provide = {} } = {}) => {
+    wrapper = mountExtended(EmptyStateWithoutAnyIssuesExperiment, {
+      propsData: {
+        ...defaultProps,
+        ...props,
+      },
+      provide: {
+        ...defaultProvide,
+        ...provide,
+      },
+    });
+  };
+
+  it('renders empty state', () => {
+    mountComponent();
+
+    expect(findCreateAnIssueVideo().exists()).toBe(true);
+
+    expect(wrapper.find('h1').text()).toBe(
+      'Use issues to collaborate on ideas, solve problems, and plan work',
+    );
+
+    const text = wrapper.text();
+
+    expect(text).toContain(
+      'With issues you can discuss the implementation of an idea, track tasks and work status, elaborate on code implementations, and accept feature proposals, questions, support requests, or bug reports.',
+    );
+
+    expect(text).toContain('Learn more about issues');
+    expect(text).toContain('Read our documentation');
+    expect(text).toContain('Enable Jira integration');
+    expect(text).toContain('This feature is only available on paid plans.');
+  });
+
+  describe('actions', () => {
+    describe('"New issue" button', () => {
+      describe('when can show the button', () => {
+        it('renders', () => {
+          mountComponent();
+
+          const newIssueButton = findNewIssueButton();
+
+          expect(newIssueButton.attributes('href')).toBe(defaultProvide.newIssuePath);
+          expect(newIssueButton.props('variant')).toBe('confirm');
+          expect(newIssueButton.text()).toBe('Create a new issue');
+        });
+      });
+
+      describe('when cannot show the button', () => {
+        it('does not render', () => {
+          mountComponent({ provide: { showNewIssueLink: false } });
+
+          expect(findNewIssueButton().exists()).toBe(false);
+        });
+      });
+    });
+
+    describe('"Email a new issue" button', () => {
+      describe('when can show the button', () => {
+        it('renders', () => {
+          mountComponent();
+
+          const newIssueButton = findIssuableByEmail();
+
+          expect(newIssueButton.props('variant')).toBe('default');
+          expect(newIssueButton.text()).toBe('Email a new issue');
+        });
+      });
+
+      describe('when cannot show the button', () => {
+        it('does not render', () => {
+          mountComponent({ props: { showIssuableByEmail: false } });
+
+          expect(findIssuableByEmail().exists()).toBe(false);
+        });
+      });
+    });
+
+    describe('Import buttons', () => {
+      describe('when can show csv buttons', () => {
+        describe('when can show import buttons', () => {
+          describe('when cannot edit', () => {
+            it('renders import CSV button and does not render from Jira button', () => {
+              mountComponent({ provide: { canEdit: false } });
+
+              const csvImportButton = findCsvImportButton();
+
+              expect(csvImportButton.exists()).toBe(true);
+              expect(csvImportButton.text()).toBe('Import CSV');
+
+              expect(findImportFromJiraButton().exists()).toBe(false);
+            });
+          });
+
+          describe('when can edit', () => {
+            it('renders import from Jira button', () => {
+              mountComponent();
+
+              const importFromJiraButton = findImportFromJiraButton();
+
+              expect(importFromJiraButton.exists()).toBe(true);
+              expect(importFromJiraButton.text()).toBe('Import from Jira');
+
+              expect(importFromJiraButton.attributes('href')).toBe(
+                defaultProvide.projectImportJiraPath,
+              );
+
+              expect(findCsvImportButton().exists()).toBe(true);
+            });
+          });
+        });
+
+        describe('when cannot show import buttons', () => {
+          it('does not render import buttons', () => {
+            mountComponent({ provide: { showImportButton: false } });
+
+            expect(findCsvImportButton().exists()).toBe(false);
+            expect(findImportFromJiraButton().exists()).toBe(false);
+          });
+        });
+      });
+
+      describe('when cannot show csv buttons', () => {
+        it('does not render import buttons', () => {
+          mountComponent({ props: { showCsvButtons: false } });
+
+          expect(findCsvImportButton().exists()).toBe(false);
+          expect(findImportFromJiraButton().exists()).toBe(false);
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/issues/list/components/empty_state_without_any_issues_spec.js b/spec/frontend/issues/list/components/empty_state_without_any_issues_spec.js
index 8e69213ebba..16db1a6098b 100644
--- a/spec/frontend/issues/list/components/empty_state_without_any_issues_spec.js
+++ b/spec/frontend/issues/list/components/empty_state_without_any_issues_spec.js
@@ -1,9 +1,12 @@
 import { GlDisclosureDropdown, GlEmptyState, GlLink } from '@gitlab/ui';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
+import { stubExperiments } from 'helpers/experimentation_helper';
 import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue';
 import EmptyStateWithoutAnyIssues from '~/issues/list/components/empty_state_without_any_issues.vue';
+import EmptyStateWithoutAnyIssuesExperiment from '~/issues/list/components/empty_state_without_any_issues_experiment.vue';
 import NewResourceDropdown from '~/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue';
 import { i18n } from '~/issues/list/constants';
+import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue';
 
 describe('EmptyStateWithoutAnyIssues component', () => {
   let wrapper;
@@ -49,6 +52,7 @@ describe('EmptyStateWithoutAnyIssues component', () => {
         ...provide,
       },
       stubs: {
+        GitlabExperiment,
         NewResourceDropdown: true,
       },
     });
@@ -191,6 +195,21 @@ describe('EmptyStateWithoutAnyIssues component', () => {
         expect(findJiraDocsLink().attributes('href')).toBe(defaultProvide.jiraIntegrationPath);
       });
     });
+
+    describe('when issues_mrs_empty_state candidate experiment', () => {
+      beforeEach(() => {
+        stubExperiments({ issues_mrs_empty_state: 'candidate' });
+      });
+
+      it('renders EmptyStateWithoutAnyIssuesExperiment', () => {
+        mountComponent();
+
+        expect(wrapper.findComponent(EmptyStateWithoutAnyIssuesExperiment).props()).toEqual({
+          showCsvButtons: false,
+          showIssuableByEmail: false,
+        });
+      });
+    });
   });
 
   describe('when signed out', () => {
diff --git a/spec/frontend/issues/list/components/gl_card_empty_state_experiment_spec.js b/spec/frontend/issues/list/components/gl_card_empty_state_experiment_spec.js
new file mode 100644
index 00000000000..4b7fd0e8fbb
--- /dev/null
+++ b/spec/frontend/issues/list/components/gl_card_empty_state_experiment_spec.js
@@ -0,0 +1,35 @@
+import { GlCard, GlIcon } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import GlCardEmptyStateExperiment from '~/issues/list/components/gl_card_empty_state_experiment.vue';
+
+describe('GlCardEmptyStateExperiment component', () => {
+  let wrapper;
+
+  const propsData = {
+    icon: 'download',
+  };
+
+  const findGlCard = () => wrapper.findComponent(GlCard);
+  const findGlIcon = () => wrapper.findComponent(GlIcon);
+  const findCardHeader = () => findGlCard().find('p');
+  const findCardBody = () => findGlCard().find('.body-content');
+
+  const mountComponent = () => {
+    wrapper = shallowMount(GlCardEmptyStateExperiment, {
+      propsData,
+      slots: {
+        header: 'Header content',
+        body: '<div class="body-content">Body content</div>',
+      },
+    });
+  };
+
+  it('renders empty state experiment card', () => {
+    mountComponent();
+
+    expect(findGlCard().exists()).toBe(true);
+    expect(findGlIcon().props('name')).toBe(propsData.icon);
+    expect(findCardHeader().text()).toBe('Header content');
+    expect(findCardBody().text()).toBe('Body content');
+  });
+});
diff --git a/spec/frontend/issues/list/components/issue_card_time_info_spec.js b/spec/frontend/issues/list/components/issue_card_time_info_spec.js
index 8286f84b98a..4b2ebc30e12 100644
--- a/spec/frontend/issues/list/components/issue_card_time_info_spec.js
+++ b/spec/frontend/issues/list/components/issue_card_time_info_spec.js
@@ -77,7 +77,7 @@ describe('CE IssueCardTimeInfo component', () => {
         const milestone = findMilestone();
 
         expect(milestone.text()).toBe('My milestone');
-        expect(milestone.findComponent(GlIcon).props('name')).toBe('clock');
+        expect(milestone.findComponent(GlIcon).props('name')).toBe('milestone');
         expect(milestone.findComponent(GlLink).attributes('href')).toBe('/milestone/webPath');
       });
 
diff --git a/spec/frontend/issues/list/components/issues_list_app_spec.js b/spec/frontend/issues/list/components/issues_list_app_spec.js
index e0e210ed10f..b5c03cd0eda 100644
--- a/spec/frontend/issues/list/components/issues_list_app_spec.js
+++ b/spec/frontend/issues/list/components/issues_list_app_spec.js
@@ -85,6 +85,9 @@ import {
   mockMilestone,
 } from 'jest/work_items/mock_data';
 
+import { stubExperiments } from 'helpers/experimentation_helper';
+import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue';
+
 import('~/issuable');
 import('~/users_select');
 
@@ -559,6 +562,21 @@ describe('CE IssuesListApp component', () => {
         });
       },
     );
+
+    describe('when issues_mrs_empty_state candidate experiment', () => {
+      beforeEach(() => {
+        stubExperiments({ issues_mrs_empty_state: 'candidate' });
+      });
+
+      it('does not render IssuableByEmail', () => {
+        wrapper = mountComponent({
+          provide: { initialEmail: true, canCreateIssue: true },
+          stubs: { GitlabExperiment },
+        });
+
+        expect(findIssuableByEmail().exists()).toBe(false);
+      });
+    });
   });
 
   describe('empty states', () => {
@@ -590,6 +608,7 @@ describe('CE IssuesListApp component', () => {
           currentTabCount: 0,
           exportCsvPathWithQuery: defaultProvide.exportCsvPath,
           showCsvButtons: true,
+          showIssuableByEmail: false,
           showNewIssueDropdown: false,
         });
       });
diff --git a/spec/frontend/search/mock_data.js b/spec/frontend/search/mock_data.js
index 7bddc4b1c48..04dab40358f 100644
--- a/spec/frontend/search/mock_data.js
+++ b/spec/frontend/search/mock_data.js
@@ -544,7 +544,7 @@ export const MOCK_NAVIGATION_ITEMS = [
   },
   {
     title: 'Milestones',
-    icon: 'clock',
+    icon: 'milestone',
     link: '/search?scope=milestones&search=et',
     is_active: false,
     pill_count: '0',
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js b/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
index 7c9f3a3546a..a1a9a05f871 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
@@ -277,7 +277,7 @@ export const mockLabelToken = {
 
 export const mockMilestoneToken = {
   type: TOKEN_TYPE_MILESTONE,
-  icon: 'clock',
+  icon: 'milestone',
   title: TOKEN_TITLE_MILESTONE,
   unique: true,
   symbol: '%',
diff --git a/spec/frontend/vue_shared/components/markdown/comment_templates_dropdown_spec.js b/spec/frontend/vue_shared/components/markdown/comment_templates_dropdown_spec.js
index e11605a998b..76ef875fed4 100644
--- a/spec/frontend/vue_shared/components/markdown/comment_templates_dropdown_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/comment_templates_dropdown_spec.js
@@ -18,6 +18,11 @@ import {
 let wrapper;
 let savedRepliesResp;
 
+const newCommentTemplatePaths = [
+  { path: '/user/comment_templates', text: 'Manage user' },
+  { path: '/group/comment_templates', text: 'Manage group' },
+];
+
 function createMockApolloProvider(response) {
   Vue.use(VueApollo);
 
@@ -35,7 +40,7 @@ function createComponent(options = {}) {
 
   return mountExtended(CommentTemplatesDropdown, {
     propsData: {
-      newCommentTemplatePath: '/new',
+      newCommentTemplatePaths,
     },
     apolloProvider: mockApollo,
   });
@@ -69,6 +74,22 @@ describe('Comment templates dropdown', () => {
     expect(savedRepliesResp).toHaveBeenCalled();
   });
 
+  it('renders multiple manage links', () => {
+    const mockApollo = createMockApolloProvider(savedRepliesResponse);
+    wrapper = createComponent({ mockApollo });
+
+    wrapper.find('.js-comment-template-toggle').trigger('click');
+
+    const links = wrapper.findAllByTestId('manage-button');
+
+    expect(links).toHaveLength(newCommentTemplatePaths.length);
+
+    newCommentTemplatePaths.forEach(({ path, text }, index) => {
+      expect(links.at(index).attributes('href')).toBe(path);
+      expect(links.at(index).text()).toBe(text);
+    });
+  });
+
   describe('when selecting a comment', () => {
     let trackingSpy;
     let mockApollo;
diff --git a/spec/frontend/vue_shared/components/markdown/header_spec.js b/spec/frontend/vue_shared/components/markdown/header_spec.js
index 57f6d751efd..64026f519e6 100644
--- a/spec/frontend/vue_shared/components/markdown/header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/header_spec.js
@@ -231,7 +231,7 @@ describe('Markdown field header component', () => {
       createWrapper({
         attachTo: '#root',
         provide: {
-          newCommentTemplatePath: 'some/path',
+          newCommentTemplatePaths: ['some/path'],
           glFeatures: {
             savedReplies: true,
           },
@@ -248,7 +248,7 @@ describe('Markdown field header component', () => {
       });
     });
 
-    it('does not show the saved replies button if newCommentTemplatePath is not defined', () => {
+    it('does not show the saved replies button if newCommentTemplatePaths is not defined', () => {
       createWrapper({
         provide: {
           glFeatures: {
diff --git a/spec/frontend/work_items/mock_data.js b/spec/frontend/work_items/mock_data.js
index 1127331677b..ff2a2cf1410 100644
--- a/spec/frontend/work_items/mock_data.js
+++ b/spec/frontend/work_items/mock_data.js
@@ -2441,7 +2441,7 @@ export const mockWorkItemNotesResponse = {
                       body: 'changed milestone to %v4.0',
                       bodyHtml:
                         '<p data-sourcepos="1:1-1:23" dir="auto">changed milestone to <a href="/flightjs/Flight/-/milestones/5" data-reference-type="milestone" data-original="%5" data-link="false" data-link-reference="false" data-project="6" data-milestone="30" data-container=body data-placement="top" title="" class="gfm gfm-milestone has-tooltip">%v4.0</a></p>',
-                      systemNoteIconName: 'clock',
+                      systemNoteIconName: 'milestone',
                       createdAt: '2022-11-14T04:18:59Z',
                       lastEditedAt: null,
                       url: 'http://127.0.0.1:3000/flightjs/Flight/-/work_items/37#note_201',
@@ -2657,7 +2657,7 @@ export const mockWorkItemNotesByIidResponse = {
                             body: 'changed milestone to %v4.0',
                             bodyHtml:
                               '\u003cp data-sourcepos="1:1-1:23" dir="auto"\u003echanged milestone to \u003ca href="/flightjs/Flight/-/milestones/5" data-reference-type="milestone" data-original="%5" data-link="false" data-link-reference="false" data-project="6" data-milestone="30" data-container="body" data-placement="top" title="" class="gfm gfm-milestone has-tooltip"\u003e%v4.0\u003c/a\u003e\u003c/p\u003e',
-                            systemNoteIconName: 'clock',
+                            systemNoteIconName: 'milestone',
                             createdAt: '2022-11-14T04:18:59Z',
                             lastEditedAt: null,
                             url: 'http://127.0.0.1:3000/flightjs/Flight/-/work_items/37#note_191',
@@ -2882,7 +2882,7 @@ export const mockMoreWorkItemNotesResponse = {
                             body: 'changed milestone to %v4.0',
                             bodyHtml:
                               '<p data-sourcepos="1:1-1:23" dir="auto">changed milestone to <a href="/flightjs/Flight/-/milestones/5" data-reference-type="milestone" data-original="%5" data-link="false" data-link-reference="false" data-project="6" data-milestone="30" data-container=body data-placement="top" title="" class="gfm gfm-milestone has-tooltip">%v4.0</a></p>',
-                            systemNoteIconName: 'clock',
+                            systemNoteIconName: 'milestone',
                             createdAt: '2022-11-14T04:18:59Z',
                             lastEditedAt: null,
                             url: 'http://127.0.0.1:3000/flightjs/Flight/-/work_items/37#note_191',
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index 3614cbe5011..5e07c2dd89b 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do
   include ProjectsHelper
   include ProjectForksHelper
   include IconsHelper
+  include IssuablesHelper
 
   let_it_be(:current_user) { create(:user) }
 
diff --git a/spec/helpers/work_items_helper_spec.rb b/spec/helpers/work_items_helper_spec.rb
index e1394c02e74..f898b32ce64 100644
--- a/spec/helpers/work_items_helper_spec.rb
+++ b/spec/helpers/work_items_helper_spec.rb
@@ -15,7 +15,8 @@ RSpec.describe WorkItemsHelper, feature_category: :team_planning do
           issues_list_path: project_issues_path(project),
           register_path: new_user_registration_path(redirect_to_referer: 'yes'),
           sign_in_path: user_session_path(redirect_to_referer: 'yes'),
-          new_comment_template_path: profile_comment_templates_path,
+          new_comment_template_paths:
+            [{ text: "Manage your comment templates", path: profile_comment_templates_path }].to_json,
           report_abuse_path: add_category_abuse_reports_path
         }
       )
diff --git a/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb b/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb
index 730554857df..f69809ab367 100644
--- a/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb
@@ -33,6 +33,20 @@ RSpec.describe Banzai::Filter::References::CommitReferenceFilter, feature_catego
       end
     end
 
+    # This solves https://gitlab.com/gitlab-org/gitlab/-/issues/450246
+    it "does not render link when reference is ending a word" do
+      doc = reference_filter("Hello Wo#{reference[0...7]}")
+
+      expect(doc.css('a')).to be_empty
+    end
+
+    # This solves https://gitlab.com/gitlab-org/gitlab/-/issues/450246
+    it "does not render link when reference is starting a word" do
+      doc = reference_filter("Hello #{reference[0...7]}ld")
+
+      expect(doc.css('a')).to be_empty
+    end
+
     it 'always uses the short ID as the link text' do
       doc = reference_filter("See #{commit.id}")
       expect(doc.text).to eq "See #{commit.short_id}"
diff --git a/spec/lib/bulk_imports/groups/loaders/group_loader_spec.rb b/spec/lib/bulk_imports/groups/loaders/group_loader_spec.rb
index 87b64ef198e..27e8b70ca5e 100644
--- a/spec/lib/bulk_imports/groups/loaders/group_loader_spec.rb
+++ b/spec/lib/bulk_imports/groups/loaders/group_loader_spec.rb
@@ -35,13 +35,14 @@ RSpec.describe BulkImports::Groups::Loaders::GroupLoader, feature_category: :imp
         group = ::Group.new
         group.validate
         expected_errors = group.errors.full_messages.to_sentence
+        service_response = ServiceResponse.error(message: '_error_', payload: { group: group })
 
         expect(::Groups::CreateService)
           .to receive(:new)
           .with(context.current_user, data)
           .and_return(service_double)
 
-        expect(service_double).to receive(:execute).and_return(group)
+        expect(service_double).to receive(:execute).and_return(service_response)
         expect(entity).not_to receive(:update!)
 
         expect { subject.load(context, data) }.to raise_error(described_class::GroupCreationError, expected_errors)
@@ -52,14 +53,14 @@ RSpec.describe BulkImports::Groups::Loaders::GroupLoader, feature_category: :imp
       shared_examples 'calls Group Create Service to create a new group' do
         it 'calls Group Create Service to create a new group' do
           group_double = instance_double(::Group)
+          service_response = ServiceResponse.success(payload: { group: group_double })
 
           expect(::Groups::CreateService)
             .to receive(:new)
             .with(context.current_user, data)
             .and_return(service_double)
 
-          expect(service_double).to receive(:execute).and_return(group_double)
-          expect(group_double).to receive(:errors).and_return([])
+          expect(service_double).to receive(:execute).and_return(service_response)
           expect(entity).to receive(:update!).with(group: group_double)
 
           subject.load(context, data)
diff --git a/spec/lib/gitlab/ci/config/interpolation/block_spec.rb b/spec/lib/gitlab/ci/config/interpolation/block_spec.rb
index 02bbbcb5a17..dcc35d12b2d 100644
--- a/spec/lib/gitlab/ci/config/interpolation/block_spec.rb
+++ b/spec/lib/gitlab/ci/config/interpolation/block_spec.rb
@@ -25,26 +25,6 @@ RSpec.describe Gitlab::Ci::Config::Interpolation::Block, feature_category: :pipe
     expect(subject.value).to eq 'abcdef'
   end
 
-  describe '.match' do
-    it 'matches each block in a string' do
-      expect { |b| described_class.match('$[[ access1 ]] $[[ access2 ]]', &b) }
-        .to yield_successive_args(['$[[ access1 ]]', 'access1'], ['$[[ access2 ]]', 'access2'])
-    end
-
-    it 'does not match an empty block' do
-      expect { |b| described_class.match('$[[]]', &b) }
-        .not_to yield_with_args(anything)
-    end
-
-    context 'when functions are specified in the block' do
-      it 'matches each block in a string' do
-        expect { |b| described_class.match('$[[ access1 | func1 ]] $[[ access2 | func1 | func2(0,1) ]]', &b) }
-          .to yield_successive_args(['$[[ access1 | func1 ]]', 'access1 | func1'],
-            ['$[[ access2 | func1 | func2(0,1) ]]', 'access2 | func1 | func2(0,1)'])
-      end
-    end
-  end
-
   describe 'when functions are specified in the block' do
     let(:function_string1) { 'truncate(1,5)' }
     let(:data) { "inputs.data | #{function_string1}" }
diff --git a/spec/lib/gitlab/ci/config/interpolation/template_spec.rb b/spec/lib/gitlab/ci/config/interpolation/template_spec.rb
index 647c698edb7..4497b7d7ceb 100644
--- a/spec/lib/gitlab/ci/config/interpolation/template_spec.rb
+++ b/spec/lib/gitlab/ci/config/interpolation/template_spec.rb
@@ -41,26 +41,6 @@ RSpec.describe Gitlab::Ci::Config::Interpolation::Template, feature_category: :p
     RESULT
   end
 
-  context 'when ci_fix_input_types is disabled' do
-    before do
-      stub_feature_flags(ci_fix_input_types: false)
-    end
-
-    it 'interpolates all values as strings' do
-      expect(subject.interpolated).to eq YAML.safe_load <<~RESULT
-      test:
-        spec:
-          env: dev
-
-      abc:
-        name: abc
-        parallel: '6'
-        allow_failure: 'true'
-        script: 'echo "This job makes 6 jobs for the dev env"'
-      RESULT
-    end
-  end
-
   context 'when interpolation can not be performed' do
     let(:config) { '$[[ xxx.yyy ]]: abc' }
 
diff --git a/spec/lib/gitlab/ci/config/interpolation/text_interpolator_spec.rb b/spec/lib/gitlab/ci/config/interpolation/text_interpolator_spec.rb
index 2e59b6982dd..20e7e3d0d26 100644
--- a/spec/lib/gitlab/ci/config/interpolation/text_interpolator_spec.rb
+++ b/spec/lib/gitlab/ci/config/interpolation/text_interpolator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Config::Interpolation::TextInterpolator, feature_category: :pipeline_composition do
+RSpec.describe Gitlab::Ci::Config::Interpolation::TextInterpolator, feature_category: :pipeline_composition, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/440667' do
   let(:arguments) { { website: 'gitlab.com' } }
   let(:content) { ::Gitlab::Config::Loader::Yaml.new("test: 'deploy $[[ inputs.website ]]'") }
   let(:header) { ::Gitlab::Config::Loader::Yaml.new("spec:\n  inputs:\n     website: ") }
diff --git a/spec/lib/gitlab/ci/config/interpolation/text_template_spec.rb b/spec/lib/gitlab/ci/config/interpolation/text_template_spec.rb
index a2f98fc0d5d..4fda0533da1 100644
--- a/spec/lib/gitlab/ci/config/interpolation/text_template_spec.rb
+++ b/spec/lib/gitlab/ci/config/interpolation/text_template_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Config::Interpolation::TextTemplate, feature_category: :pipeline_composition do
+RSpec.describe Gitlab::Ci::Config::Interpolation::TextTemplate, feature_category: :pipeline_composition, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/440667' do
   subject(:template) { described_class.new(config, ctx) }
 
   let(:config) do
diff --git a/spec/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency_spec.rb b/spec/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency_spec.rb
index 69747dfceeb..a033e3a9d8a 100644
--- a/spec/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/concurrency_limit/workers_concurrency_spec.rb
@@ -73,6 +73,19 @@ RSpec.describe Gitlab::SidekiqMiddleware::ConcurrencyLimit::WorkersConcurrency,
       it 'returns current_workers' do
         expect(workers).to eq('TestConcurrencyLimitWorker' => 10)
       end
+
+      context 'with multiple shard instances' do
+        before do
+          allow(Gitlab::Redis::Queues)
+              .to receive(:instances).and_return({ 'main' => Gitlab::Redis::Queues, 'shard' => Gitlab::Redis::Queues })
+        end
+
+        it 'returns count for all instances' do
+          expect(workers).to eq({
+            'TestConcurrencyLimitWorker' => current_concurrency * Gitlab::Redis::Queues.instances.size
+          })
+        end
+      end
     end
 
     context 'with cache' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index fbffa12cf96..fdbcb14654f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -7133,6 +7133,30 @@ RSpec.describe User, feature_category: :user_profile do
       it { is_expected.to eq(false) }
     end
 
+    context 'using a correct password' do
+      let(:user) { create(:user) }
+      let(:password) { user.password }
+
+      it { is_expected.to eq(true) }
+
+      context 'when password authentication is disabled' do
+        before do
+          stub_application_setting(password_authentication_enabled_for_web: false)
+          stub_application_setting(password_authentication_enabled_for_git: false)
+        end
+
+        it { is_expected.to eq(false) }
+      end
+
+      context 'when user with LDAP identity' do
+        before do
+          create(:identity, provider: 'ldapmain', user: user)
+        end
+
+        it { is_expected.to eq(false) }
+      end
+    end
+
     context 'using a wrong password' do
       let(:user) { create(:user) }
       let(:password) { 'WRONG PASSWORD' }
diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb
index 0a65ed4ab16..2b49f388abd 100644
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Groups::CreateService, '#execute', feature_category: :groups_and_
   let(:current_user) { user }
   let(:group_params) { { path: 'group_path', visibility_level: Gitlab::VisibilityLevel::PUBLIC }.merge(extra_params) }
   let(:extra_params) { {} }
-  let(:created_group) { response }
+  let(:created_group) { response[:group] }
 
   subject(:response) { described_class.new(current_user, group_params).execute }
 
@@ -20,14 +20,14 @@ RSpec.describe Groups::CreateService, '#execute', feature_category: :groups_and_
   shared_examples 'creating a group' do
     specify do
       expect { response }.to change { Group.count }
-      expect(created_group).to be_persisted
+      expect(response).to be_success
     end
   end
 
   shared_examples 'does not create a group' do
     specify do
       expect { response }.not_to change { Group.count }
-      expect(created_group).not_to be_persisted
+      expect(response).to be_error
     end
   end
 
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 37cfd797978..9c89602ecde 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -2605,7 +2605,7 @@
 - './ee/spec/services/group_saml/saml_group_links/destroy_service_spec.rb'
 - './ee/spec/services/group_saml/saml_provider/create_service_spec.rb'
 - './ee/spec/services/group_saml/saml_provider/update_service_spec.rb'
-- './ee/spec/services/groups/create_service_spec.rb'
+- './ee/spec/services/ee/groups/create_service_spec.rb'
 - './ee/spec/services/groups/destroy_service_spec.rb'
 - './ee/spec/services/groups/epics_count_service_spec.rb'
 - './ee/spec/services/groups/mark_for_deletion_service_spec.rb'
diff --git a/spec/views/shared/snippets/_snippet.html.haml_spec.rb b/spec/views/shared/snippets/_snippet.html.haml_spec.rb
index 71ef97b0448..847dd030868 100644
--- a/spec/views/shared/snippets/_snippet.html.haml_spec.rb
+++ b/spec/views/shared/snippets/_snippet.html.haml_spec.rb
@@ -61,7 +61,7 @@ RSpec.describe 'shared/snippets/_snippet.html.haml' do
       end
 
       it 'does not render tooltip' do
-        expect(rendered).not_to have_selector("span.has-tooltip")
+        expect(rendered).not_to have_selector("span.has-tooltip[title='This snippet is hidden because its author has been banned']")
       end
     end