Add latest changes from gitlab-org/gitlab@master

112 files changed, 975 insertions, 266 deletions

diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js
index 6fc37e9331f..d6fdcea468a 100644
--- a/app/assets/javascripts/activities.js
+++ b/app/assets/javascripts/activities.js
@@ -2,7 +2,7 @@
 
 import $ from 'jquery';
 import { setCookie } from '~/lib/utils/common_utils';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { s__ } from '~/locale';
 import { localTimeAgo } from './lib/utils/datetime_utility';
 import Pager from './pager';
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/base.vue b/app/assets/javascripts/admin/broadcast_messages/components/base.vue
index f869d21d55f..c28cd266617 100644
--- a/app/assets/javascripts/admin/broadcast_messages/components/base.vue
+++ b/app/assets/javascripts/admin/broadcast_messages/components/base.vue
@@ -2,7 +2,7 @@
 import { GlPagination } from '@gitlab/ui';
 import { redirectTo } from '~/lib/utils/url_utility';
 import { buildUrlWithCurrentLocation } from '~/lib/utils/common_utils';
-import { createAlert, VARIANT_DANGER } from '~/flash';
+import { createAlert, VARIANT_DANGER } from '~/alert';
 import { s__ } from '~/locale';
 import axios from '~/lib/utils/axios_utils';
 import { NEW_BROADCAST_MESSAGE } from '../constants';
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue b/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue
index 36796708e78..b52b7f6cdeb 100644
--- a/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue
+++ b/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue
@@ -12,7 +12,7 @@ import {
 } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import { s__ } from '~/locale';
-import { createAlert, VARIANT_DANGER } from '~/flash';
+import { createAlert, VARIANT_DANGER } from '~/alert';
 import { redirectTo } from '~/lib/utils/url_utility';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { BROADCAST_MESSAGES_PATH, THEMES, TYPES, TYPE_BANNER } from '../constants';
diff --git a/app/assets/javascripts/admin/deploy_keys/components/table.vue b/app/assets/javascripts/admin/deploy_keys/components/table.vue
index be85ee43891..134498af348 100644
--- a/app/assets/javascripts/admin/deploy_keys/components/table.vue
+++ b/app/assets/javascripts/admin/deploy_keys/components/table.vue
@@ -5,7 +5,7 @@ import { __ } from '~/locale';
 import Api, { DEFAULT_PER_PAGE } from '~/api';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { cleanLeadingSeparator } from '~/lib/utils/url_utility';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import csrf from '~/lib/utils/csrf';
 
 export default {
diff --git a/app/assets/javascripts/admin/statistics_panel/store/actions.js b/app/assets/javascripts/admin/statistics_panel/store/actions.js
index 4f952698d7a..7372f03ec0b 100644
--- a/app/assets/javascripts/admin/statistics_panel/store/actions.js
+++ b/app/assets/javascripts/admin/statistics_panel/store/actions.js
@@ -1,5 +1,5 @@
 import Api from '~/api';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { s__ } from '~/locale';
 import * as types from './mutation_types';
diff --git a/app/assets/javascripts/admin/users/components/users_table.vue b/app/assets/javascripts/admin/users/components/users_table.vue
index f569cda0a4b..e55622d40ba 100644
--- a/app/assets/javascripts/admin/users/components/users_table.vue
+++ b/app/assets/javascripts/admin/users/components/users_table.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlSkeletonLoader, GlTable } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { convertNodeIdsFromGraphQLIds } from '~/graphql_shared/utils';
 import { thWidthPercent } from '~/lib/utils/table_utility';
 import { s__, __ } from '~/locale';
diff --git a/app/assets/javascripts/authentication/webauthn/util.js b/app/assets/javascripts/authentication/webauthn/util.js
index 2a0740cf488..4e1409b9ed9 100644
--- a/app/assets/javascripts/authentication/webauthn/util.js
+++ b/app/assets/javascripts/authentication/webauthn/util.js
@@ -1,9 +1,6 @@
 export function supported() {
   return Boolean(
-    navigator.credentials &&
-      navigator.credentials.create &&
-      navigator.credentials.get &&
-      window.PublicKeyCredential,
+    navigator.credentials?.create && navigator.credentials?.get && window.PublicKeyCredential,
   );
 }
 
diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue
index 9c3580a95fe..9db9bea63b2 100644
--- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue
+++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue
@@ -1,5 +1,5 @@
 <script>
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { mapEnvironmentNames, reportMessageToSentry } from '../utils';
diff --git a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
index 7675191f642..79600012838 100644
--- a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
+++ b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlSprintf, GlLink, GlModalDirective } from '@gitlab/ui';
-import { createAlert, VARIANT_SUCCESS } from '~/flash';
+import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { redirectTo, setUrlParams } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
 import RunnerInstructionsModal from '~/vue_shared/components/runner_instructions/runner_instructions_modal.vue';
diff --git a/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue b/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue
index 8d4303778af..36fb1cee525 100644
--- a/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue
+++ b/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue
@@ -1,5 +1,5 @@
 <script>
-import { createAlert, VARIANT_SUCCESS } from '~/flash';
+import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { redirectTo } from '~/lib/utils/url_utility';
diff --git a/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue
index ce2c511ddd4..d452adb34d9 100644
--- a/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue
+++ b/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlButton, GlLink } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { updateHistory } from '~/lib/utils/url_utility';
 import { fetchPolicies } from '~/lib/graphql';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
@@ -128,8 +128,8 @@ export default {
       return isSearchFiltered(this.search);
     },
     shouldShowCreateRunnerWorkflow() {
-      // create_runner_workflow feature flag
-      return this.glFeatures.createRunnerWorkflow;
+      // create_runner_workflow_for_admin feature flag
+      return this.glFeatures.createRunnerWorkflowForAdmin;
     },
   },
   watch: {
diff --git a/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue b/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue
index d2f7912fabb..2cff11c1aa1 100644
--- a/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue
@@ -43,8 +43,8 @@ export default {
   },
   computed: {
     shouldShowCreateRunnerWorkflow() {
-      // create_runner_workflow feature flag
-      return this.newRunnerPath && this.glFeatures?.createRunnerWorkflow;
+      // create_runner_workflow_for_admin feature flag
+      return this.newRunnerPath && this.glFeatures?.createRunnerWorkflowForAdmin;
     },
   },
   modalId: 'runners-empty-state-instructions-modal',
diff --git a/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue b/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue
index 273a9aa823c..2db3a2f42a7 100644
--- a/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue
+++ b/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue
@@ -1,5 +1,5 @@
 <script>
-import { createAlert, VARIANT_SUCCESS } from '~/flash';
+import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { redirectTo } from '~/lib/utils/url_utility';
diff --git a/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue b/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue
index e66a1c7b1aa..294d06a66e7 100644
--- a/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue
+++ b/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlLink } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { updateHistory } from '~/lib/utils/url_utility';
 import { fetchPolicies } from '~/lib/graphql';
 import { upgradeStatusTokenConfig } from 'ee_else_ce/ci/runner/components/search_tokens/upgrade_status_token_config';
diff --git a/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue b/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue
index 4593c9ae52b..843342b20df 100644
--- a/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue
+++ b/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue
@@ -1,5 +1,5 @@
 <script>
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import RunnerHeader from '../components/runner_header.vue';
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index a788703fd08..c94c91654fc 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -1,7 +1,7 @@
 import { GlToast } from '@gitlab/ui';
 import Visibility from 'visibilityjs';
 import Vue from 'vue';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import AccessorUtilities from '~/lib/utils/accessor';
 import Poll from '~/lib/utils/poll';
 import { s__ } from '~/locale';
diff --git a/app/assets/javascripts/deploy_freeze/store/actions.js b/app/assets/javascripts/deploy_freeze/store/actions.js
index 76a4eaaff3f..77d3037ff57 100644
--- a/app/assets/javascripts/deploy_freeze/store/actions.js
+++ b/app/assets/javascripts/deploy_freeze/store/actions.js
@@ -1,5 +1,5 @@
 import Api from '~/api';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { logError } from '~/lib/logger';
 import { __ } from '~/locale';
 import * as types from './mutation_types';
diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue
index db5e9a954cf..5fc15578827 100644
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlLoadingIcon, GlIcon } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { s__ } from '~/locale';
 import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue';
 import eventHub from '../eventhub';
diff --git a/app/assets/javascripts/environments/components/delete_environment_modal.vue b/app/assets/javascripts/environments/components/delete_environment_modal.vue
index 78e1b8d5cb2..f91d288a54c 100644
--- a/app/assets/javascripts/environments/components/delete_environment_modal.vue
+++ b/app/assets/javascripts/environments/components/delete_environment_modal.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlTooltipDirective, GlModal } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __, s__, sprintf } from '~/locale';
 import eventHub from '../event_hub';
 import deleteEnvironmentMutation from '../graphql/mutations/delete_environment.mutation.graphql';
diff --git a/app/assets/javascripts/environments/components/deployment.vue b/app/assets/javascripts/environments/components/deployment.vue
index b00a0777a03..01b8208fd55 100644
--- a/app/assets/javascripts/environments/components/deployment.vue
+++ b/app/assets/javascripts/environments/components/deployment.vue
@@ -10,7 +10,7 @@ import {
 import { __, s__ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import deploymentDetails from '../graphql/queries/deployment_details.query.graphql';
 import DeploymentStatusBadge from './deployment_status_badge.vue';
 import Commit from './commit.vue';
diff --git a/app/assets/javascripts/environments/components/edit_environment.vue b/app/assets/javascripts/environments/components/edit_environment.vue
index 901d0f5b34d..b63a6897a39 100644
--- a/app/assets/javascripts/environments/components/edit_environment.vue
+++ b/app/assets/javascripts/environments/components/edit_environment.vue
@@ -1,5 +1,5 @@
 <script>
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import EnvironmentForm from './environment_form.vue';
diff --git a/app/assets/javascripts/environments/components/new_environment.vue b/app/assets/javascripts/environments/components/new_environment.vue
index bb4d6ab3428..4b58d133817 100644
--- a/app/assets/javascripts/environments/components/new_environment.vue
+++ b/app/assets/javascripts/environments/components/new_environment.vue
@@ -1,5 +1,5 @@
 <script>
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import EnvironmentForm from './environment_form.vue';
diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js
index 5e936ad8c96..f8e94cf3ea9 100644
--- a/app/assets/javascripts/environments/mixins/environments_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_mixin.js
@@ -3,7 +3,7 @@
  */
 import { isEqual, isFunction, omitBy } from 'lodash';
 import Visibility from 'visibilityjs';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import Poll from '~/lib/utils/poll';
 import { getParameterByName } from '~/lib/utils/url_utility';
 import { s__, __ } from '~/locale';
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index 148bf0a98ee..7c2339dac71 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlLoadingIcon, GlModal, GlEmptyState } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { HTTP_STATUS_FORBIDDEN } from '~/lib/utils/http_status';
 import { mergeUrlParams, getParameterByName } from '~/lib/utils/url_utility';
 import { __, s__, sprintf } from '~/locale';
diff --git a/app/assets/javascripts/groups/components/group_name_and_path.vue b/app/assets/javascripts/groups/components/group_name_and_path.vue
index 5f997ecc7ba..1f9fc68a612 100644
--- a/app/assets/javascripts/groups/components/group_name_and_path.vue
+++ b/app/assets/javascripts/groups/components/group_name_and_path.vue
@@ -18,7 +18,7 @@ import { debounce } from 'lodash';
 
 import { s__, __ } from '~/locale';
 import { getGroupPathAvailability } from '~/rest_api';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { slugify } from '~/lib/utils/text_utility';
 import axios from '~/lib/utils/axios_utils';
 import { helpPagePath } from '~/helpers/help_page_helper';
diff --git a/app/assets/javascripts/groups/settings/components/access_dropdown.vue b/app/assets/javascripts/groups/settings/components/access_dropdown.vue
index db8e424e166..8bc5f28ebfb 100644
--- a/app/assets/javascripts/groups/settings/components/access_dropdown.vue
+++ b/app/assets/javascripts/groups/settings/components/access_dropdown.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlDropdown, GlDropdownItem, GlDropdownSectionHeader, GlSearchBoxByType } from '@gitlab/ui';
 import { debounce, intersectionWith, groupBy, differenceBy, intersectionBy } from 'lodash';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __, s__, n__ } from '~/locale';
 import { getSubGroups } from '../api/access_dropdown_api';
 import { LEVEL_TYPES } from '../constants';
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index 7d2ddd2176b..5ef6c974920 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -106,7 +106,7 @@ export default {
       reimportRequests: [],
       importTargets: {},
       unavailableFeaturesAlertVisible: true,
-      helpUrl: helpPagePath('ee/user/group/import', {
+      helpUrl: helpPagePath('user/group/import', {
         anchor: 'visibility-rules',
       }),
     };
diff --git a/app/assets/javascripts/labels/components/promote_label_modal.vue b/app/assets/javascripts/labels/components/promote_label_modal.vue
index 1b99a094c48..890cad26ee8 100644
--- a/app/assets/javascripts/labels/components/promote_label_modal.vue
+++ b/app/assets/javascripts/labels/components/promote_label_modal.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlSprintf, GlModal } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { s__, __, sprintf } from '~/locale';
diff --git a/app/assets/javascripts/labels/group_label_subscription.js b/app/assets/javascripts/labels/group_label_subscription.js
index c4f80d32a83..4db0ab3ba3e 100644
--- a/app/assets/javascripts/labels/group_label_subscription.js
+++ b/app/assets/javascripts/labels/group_label_subscription.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import { __ } from '~/locale';
 import { fixTitle, hide } from '~/tooltips';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 
 const tooltipTitles = {
diff --git a/app/assets/javascripts/labels/label_manager.js b/app/assets/javascripts/labels/label_manager.js
index be515869bff..f4d7c610cae 100644
--- a/app/assets/javascripts/labels/label_manager.js
+++ b/app/assets/javascripts/labels/label_manager.js
@@ -3,7 +3,7 @@
 import $ from 'jquery';
 import Sortable from 'sortablejs';
 import { dispose } from '~/tooltips';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { __ } from '~/locale';
 
diff --git a/app/assets/javascripts/labels/labels_select.js b/app/assets/javascripts/labels/labels_select.js
index 515b0a79a03..587cc82f0fa 100644
--- a/app/assets/javascripts/labels/labels_select.js
+++ b/app/assets/javascripts/labels/labels_select.js
@@ -6,7 +6,7 @@ import { difference, isEqual, escape, sortBy, template, union } from 'lodash';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 import IssuableBulkUpdateActions from '~/issuable/issuable_bulk_update_actions';
 import { isScopedLabel } from '~/lib/utils/common_utils';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { sprintf, __ } from '~/locale';
 import CreateLabelDropdown from './create_label_dropdown';
diff --git a/app/assets/javascripts/labels/project_label_subscription.js b/app/assets/javascripts/labels/project_label_subscription.js
index 9ca6ee5609c..f2227ddcf92 100644
--- a/app/assets/javascripts/labels/project_label_subscription.js
+++ b/app/assets/javascripts/labels/project_label_subscription.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import { fixTitle } from '~/tooltips';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { __ } from '~/locale';
 
diff --git a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
index 1590e693c07..730f816821d 100644
--- a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
+++ b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlListbox } from '@gitlab/ui';
 import { debounce } from 'lodash';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import axios from '~/lib/utils/axios_utils';
 
diff --git a/app/assets/javascripts/mirrors/ssh_mirror.js b/app/assets/javascripts/mirrors/ssh_mirror.js
index 037120a0d81..68b18a34ded 100644
--- a/app/assets/javascripts/mirrors/ssh_mirror.js
+++ b/app/assets/javascripts/mirrors/ssh_mirror.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import { escape } from 'lodash';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { backOff } from '~/lib/utils/common_utils';
 import { HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status';
diff --git a/app/assets/javascripts/operation_settings/store/actions.js b/app/assets/javascripts/operation_settings/store/actions.js
index 5f60cab8bdd..5c870fd5f55 100644
--- a/app/assets/javascripts/operation_settings/store/actions.js
+++ b/app/assets/javascripts/operation_settings/store/actions.js
@@ -1,4 +1,4 @@
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { refreshCurrentPage } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
@@ -26,7 +26,7 @@ export const saveChanges = ({ state, dispatch }) =>
 export const receiveSaveChangesSuccess = () => {
   /**
    * The operations_controller currently handles successful requests
-   * by creating a flash banner messsage to notify the user.
+   * by creating a alert banner messsage to notify the user.
    */
   refreshCurrentPage();
 };
diff --git a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue
index 605d40eddee..16f6aa5aaa4 100644
--- a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue
+++ b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import GetFailedJobsQuery from '../../graphql/queries/get_failed_jobs.query.graphql';
 import { prepareFailedJobs } from './utils';
diff --git a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue
index 041b62e02ec..778f014bcd3 100644
--- a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue
+++ b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue
@@ -2,7 +2,7 @@
 import { GlButton, GlLink, GlTableLite } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { __, s__ } from '~/locale';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { redirectTo } from '~/lib/utils/url_utility';
 import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue';
 import RetryFailedJobMutation from '../../graphql/mutations/retry_failed_job.mutation.graphql';
diff --git a/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue b/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue
index f1ad312dcaa..661de43fe3c 100644
--- a/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue
+++ b/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlIntersectionObserver, GlLoadingIcon, GlSkeletonLoader } from '@gitlab/ui';
 import produce from 'immer';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import eventHub from '~/jobs/components/table/event_hub';
 import JobsTable from '~/jobs/components/table/jobs_table.vue';
diff --git a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue b/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue
index 7020bfc1e65..ffb6ab71b22 100644
--- a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlTooltipDirective, GlButton, GlLoadingIcon, GlIcon } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants';
 import { dasherize } from '~/lib/utils/text_utility';
diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue
index ec42b738e03..936cd6f0be5 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue
@@ -14,7 +14,7 @@
 
 import { GlDropdown, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { __, sprintf } from '~/locale';
 import eventHub from '../../event_hub';
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
index 4111823e0bb..640129b9c4c 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlEmptyState, GlIcon, GlLoadingIcon, GlCollapsibleListbox } from '@gitlab/ui';
 import { isEqual } from 'lodash';
-import { createAlert, VARIANT_INFO, VARIANT_WARNING } from '~/flash';
+import { createAlert, VARIANT_INFO, VARIANT_WARNING } from '~/alert';
 import { getParameterByName } from '~/lib/utils/url_utility';
 import { __, s__ } from '~/locale';
 import Tracking from '~/tracking';
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue
index f34b3f56c5b..50d34070e61 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
 import { s__, __, sprintf } from '~/locale';
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue
index b57d0ac1fd7..81f46d5f2f9 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue
@@ -2,7 +2,7 @@
 import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import Api from '~/api';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { FETCH_BRANCH_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../../constants';
 
 export default {
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue
index 5846a1f6ed9..b32f5de2d7e 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue
@@ -2,7 +2,7 @@
 import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import Api from '~/api';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { FETCH_TAG_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../../constants';
 
 export default {
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue
index 73f7d3f52c3..a89354c671a 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue
@@ -8,7 +8,7 @@ import {
 } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import Api from '~/api';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import {
   ANY_TRIGGER_AUTHOR,
   FETCH_AUTHOR_ERROR_MESSAGE,
diff --git a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
index e6770b71113..481953608e9 100644
--- a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
+++ b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
@@ -1,5 +1,5 @@
 import Visibility from 'visibilityjs';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils';
 import { HTTP_STATUS_UNAUTHORIZED } from '~/lib/utils/http_status';
diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
index ba51347ad69..61847affa1f 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -1,5 +1,5 @@
 import VueRouter from 'vue-router';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import { pipelineTabName } from './constants';
 import { createPipelineHeaderApp } from './pipeline_details_header';
diff --git a/app/assets/javascripts/pipelines/stores/test_reports/actions.js b/app/assets/javascripts/pipelines/stores/test_reports/actions.js
index c77b4813e33..1b51bb804d0 100644
--- a/app/assets/javascripts/pipelines/stores/test_reports/actions.js
+++ b/app/assets/javascripts/pipelines/stores/test_reports/actions.js
@@ -1,4 +1,4 @@
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { s__ } from '~/locale';
 import * as types from './mutation_types';
diff --git a/app/assets/javascripts/pipelines/stores/test_reports/mutations.js b/app/assets/javascripts/pipelines/stores/test_reports/mutations.js
index bff30acfe36..466574157f5 100644
--- a/app/assets/javascripts/pipelines/stores/test_reports/mutations.js
+++ b/app/assets/javascripts/pipelines/stores/test_reports/mutations.js
@@ -1,4 +1,4 @@
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { s__ } from '~/locale';
 import * as types from './mutation_types';
 
diff --git a/app/assets/javascripts/projects/commit/store/actions.js b/app/assets/javascripts/projects/commit/store/actions.js
index cfff93eac5a..501006a8be5 100644
--- a/app/assets/javascripts/projects/commit/store/actions.js
+++ b/app/assets/javascripts/projects/commit/store/actions.js
@@ -1,4 +1,4 @@
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { PROJECT_BRANCHES_ERROR } from '../constants';
 import * as types from './mutation_types';
diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue
index dafc4bc5abf..54d13ecc9c8 100644
--- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue
+++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import {
   getQueryHeaders,
diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue
index 62b1209131c..71f53613a3b 100644
--- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue
+++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlLoadingIcon, GlLink } from '@gitlab/ui';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import {
   getQueryHeaders,
   toggleQueryPollingByVisibility,
diff --git a/app/assets/javascripts/projects/commits/store/actions.js b/app/assets/javascripts/projects/commits/store/actions.js
index 9365066418b..5175f7f9151 100644
--- a/app/assets/javascripts/projects/commits/store/actions.js
+++ b/app/assets/javascripts/projects/commits/store/actions.js
@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/browser';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { joinPaths } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
diff --git a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue
index 92ff06cd579..8af1667e26b 100644
--- a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue
+++ b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlDropdownSectionHeader } from '@gitlab/ui';
 import { debounce } from 'lodash';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { s__ } from '~/locale';
 
diff --git a/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue b/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue
index 0c64fe9617c..034bae3066d 100644
--- a/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue
+++ b/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlDropdownSectionHeader } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { s__ } from '~/locale';
 
diff --git a/app/assets/javascripts/projects/project_find_file.js b/app/assets/javascripts/projects/project_find_file.js
index 71329c4f461..a8b884a68a0 100644
--- a/app/assets/javascripts/projects/project_find_file.js
+++ b/app/assets/javascripts/projects/project_find_file.js
@@ -2,7 +2,7 @@
 
 import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import $ from 'jquery';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { sanitize } from '~/lib/dompurify';
 import axios from '~/lib/utils/axios_utils';
 import { spriteIcon } from '~/lib/utils/common_utils';
diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js
index dcf7415a444..52b8e7e1cd5 100644
--- a/app/assets/javascripts/projects/settings/access_dropdown.js
+++ b/app/assets/javascripts/projects/settings/access_dropdown.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-underscore-dangle, class-methods-use-this */
 import { escape, find, countBy } from 'lodash';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { n__, s__, __, sprintf } from '~/locale';
 import { getUsers, getGroups, getDeployKeys } from './api/access_dropdown_api';
 import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants';
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue b/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue
index f2b1c749abc..3dcacf9eb34 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue
@@ -7,7 +7,7 @@ import {
   GlSprintf,
   GlLink,
 } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { s__, sprintf } from '~/locale';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import branchesQuery from '../../queries/branches.query.graphql';
diff --git a/app/assets/javascripts/projects/settings/components/access_dropdown.vue b/app/assets/javascripts/projects/settings/components/access_dropdown.vue
index cc47496971d..627914ae2b1 100644
--- a/app/assets/javascripts/projects/settings/components/access_dropdown.vue
+++ b/app/assets/javascripts/projects/settings/components/access_dropdown.vue
@@ -9,7 +9,7 @@ import {
   GlSprintf,
 } from '@gitlab/ui';
 import { debounce, intersectionWith, groupBy, differenceBy, intersectionBy } from 'lodash';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __, s__, n__ } from '~/locale';
 import { getUsers, getGroups, getDeployKeys } from '../api/access_dropdown_api';
 import { LEVEL_TYPES, ACCESS_LEVELS } from '../constants';
diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
index f3d392a0ec4..7709419b6f8 100644
--- a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
+++ b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import branchRulesQuery from 'ee_else_ce/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql';
 import { expandSection } from '~/settings_panels';
 import { scrollToElement } from '~/lib/utils/common_utils';
diff --git a/app/assets/javascripts/projects/star.js b/app/assets/javascripts/projects/star.js
index 55c3d68cd11..f294811dfff 100644
--- a/app/assets/javascripts/projects/star.js
+++ b/app/assets/javascripts/projects/star.js
@@ -1,4 +1,4 @@
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { spriteIcon } from '~/lib/utils/common_utils';
 import { __, s__ } from '~/locale';
diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
index 9f9b6424125..5b620aa2300 100644
--- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
+++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
 import Visibility from 'visibilityjs';
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import Poll from '~/lib/utils/poll';
 import { __, s__, sprintf } from '~/locale';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
diff --git a/app/assets/javascripts/related_issues/components/related_issues_root.vue b/app/assets/javascripts/related_issues/components/related_issues_root.vue
index ed70e1ce8a8..51f4e4f7d7b 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_root.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_root.vue
@@ -23,7 +23,7 @@ Your caret can stop touching a `rawReference` can happen in a variety of ways:
    and hide the `AddIssuableForm` area.
 
 */
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { getIdFromGraphQLId, isGid } from '~/graphql_shared/utils';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { HTTP_STATUS_NOT_FOUND } from '~/lib/utils/http_status';
diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index 77f80dacd11..f63616a2bea 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -6,7 +6,7 @@ class Admin::RunnersController < Admin::ApplicationController
   before_action :runner, except: [:index, :new, :tag_list, :runner_setup_scripts]
 
   before_action only: [:index] do
-    push_frontend_feature_flag(:create_runner_workflow, current_user)
+    push_frontend_feature_flag(:create_runner_workflow_for_admin, current_user)
   end
 
   feature_category :runner
@@ -23,11 +23,12 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   def new
-    render_404 unless Feature.enabled?(:create_runner_workflow, current_user)
+    render_404 unless Feature.enabled?(:create_runner_workflow_for_admin, current_user)
   end
 
   def register
-    render_404 unless Feature.enabled?(:create_runner_workflow, current_user) && runner.registration_available?
+    render_404 unless Feature.enabled?(:create_runner_workflow_for_admin, current_user) &&
+      runner.registration_available?
   end
 
   def update
diff --git a/app/graphql/mutations/ci/job_artifact/bulk_destroy.rb b/app/graphql/mutations/ci/job_artifact/bulk_destroy.rb
new file mode 100644
index 00000000000..53036496de4
--- /dev/null
+++ b/app/graphql/mutations/ci/job_artifact/bulk_destroy.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Ci
+    module JobArtifact
+      class BulkDestroy < BaseMutation
+        graphql_name 'BulkDestroyJobArtifacts'
+
+        authorize :destroy_artifacts
+
+        ArtifactId = ::Types::GlobalIDType[::Ci::JobArtifact]
+        ProjectId = ::Types::GlobalIDType[::Project]
+
+        argument :ids, [ArtifactId],
+          required: true,
+          description: 'Global IDs of the job artifacts to destroy.',
+          prepare: ->(global_ids, _ctx) { GitlabSchema.parse_gids(global_ids, expected_type: ::Ci::JobArtifact) }
+
+        argument :project_id, ProjectId,
+          required: true,
+          description: 'Global Project ID of the job artifacts to destroy. Incompatible with projectPath.'
+
+        field :destroyed_count, ::GraphQL::Types::Int,
+          null: true,
+          description: 'Number of job artifacts deleted.'
+
+        field :destroyed_ids, [ArtifactId],
+          null: true,
+          description: 'IDs of job artifacts that were deleted.'
+
+        def find_object(id:)
+          GlobalID::Locator.locate(id)
+        end
+
+        def resolve(**args)
+          ids = args[:ids]
+          project_id = args[:project_id]
+
+          project = authorized_find!(id: project_id)
+
+          if Feature.disabled?(:ci_job_artifact_bulk_destroy, project)
+            raise Gitlab::Graphql::Errors::ResourceNotAvailable,
+              '`ci_job_artifact_bulk_destroy` feature flag is disabled.'
+          end
+
+          raise Gitlab::Graphql::Errors::ArgumentError, 'IDs array of job artifacts can not be empty' if ids.empty?
+
+          result = ::Ci::JobArtifacts::BulkDeleteByProjectService.new(
+            job_artifact_ids: model_ids_of(ids),
+            current_user: current_user,
+            project: project
+          ).execute
+
+          if result.success?
+            result.payload.slice(:destroyed_count, :destroyed_ids).merge(errors: [])
+          else
+            { errors: result.errors }
+          end
+        end
+
+        private
+
+        def model_ids_of(global_ids)
+          global_ids.filter_map { |gid| gid.model_id.to_i }
+        end
+      end
+    end
+  end
+end
diff --git a/app/graphql/mutations/ci/runner/create.rb b/app/graphql/mutations/ci/runner/create.rb
index 1cdee560ca8..98300ee4c38 100644
--- a/app/graphql/mutations/ci/runner/create.rb
+++ b/app/graphql/mutations/ci/runner/create.rb
@@ -16,9 +16,9 @@ module Mutations
           description: 'Runner after mutation.'
 
         def resolve(**args)
-          if Feature.disabled?(:create_runner_workflow)
+          if Feature.disabled?(:create_runner_workflow_for_admin, current_user)
             raise Gitlab::Graphql::Errors::ResourceNotAvailable,
-              '`create_runner_workflow` feature flag is disabled.'
+              '`create_runner_workflow_for_admin` feature flag is disabled.'
           end
 
           create_runner(args)
diff --git a/app/graphql/types/mutation_type.rb b/app/graphql/types/mutation_type.rb
index d5bb35c1240..08ac6d7f658 100644
--- a/app/graphql/types/mutation_type.rb
+++ b/app/graphql/types/mutation_type.rb
@@ -139,6 +139,7 @@ module Types
     mount_mutation Mutations::Ci::Job::Cancel
     mount_mutation Mutations::Ci::Job::Unschedule
     mount_mutation Mutations::Ci::JobArtifact::Destroy
+    mount_mutation Mutations::Ci::JobArtifact::BulkDestroy, alpha: { milestone: '15.10' }
     mount_mutation Mutations::Ci::JobTokenScope::AddProject
     mount_mutation Mutations::Ci::JobTokenScope::RemoveProject
     mount_mutation Mutations::Ci::Runner::Create, alpha: { milestone: '15.10' }
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 98ce981ad8e..ff7166d86a2 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -395,7 +395,7 @@ class ContainerRepository < ApplicationRecord
   end
 
   def migrated?
-    (self.created_at && MIGRATION_PHASE_1_ENDED_AT < self.created_at) || import_done?
+    Gitlab.com?
   end
 
   def last_import_step_done_at
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb
index 7afecb2c4dd..b64e7e16433 100644
--- a/app/policies/global_policy.rb
+++ b/app/policies/global_policy.rb
@@ -23,7 +23,7 @@ class GlobalPolicy < BasePolicy
   condition(:migration_bot, scope: :user) { @user&.migration_bot? }
 
   condition(:create_runner_workflow_enabled) do
-    Feature.enabled?(:create_runner_workflow)
+    Feature.enabled?(:create_runner_workflow_for_admin, @user)
   end
 
   condition(:service_account, scope: :user) { @user&.service_account? }
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index ae736865e17..a11e2c00cf8 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -85,7 +85,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
   condition(:crm_enabled, score: 0, scope: :subject) { @subject.crm_enabled? }
 
   condition(:create_runner_workflow_enabled) do
-    Feature.enabled?(:create_runner_workflow)
+    Feature.enabled?(:create_runner_workflow_for_admin)
   end
 
   condition(:achievements_enabled, scope: :subject) do
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 1d635b45207..cab3dff0400 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -235,7 +235,7 @@ class ProjectPolicy < BasePolicy
   end
 
   condition(:create_runner_workflow_enabled) do
-    Feature.enabled?(:create_runner_workflow)
+    Feature.enabled?(:create_runner_workflow_for_admin)
   end
 
   # `:read_project` may be prevented in EE, but `:read_project_for_iids` should
diff --git a/app/services/ci/job_artifacts/bulk_delete_by_project_service.rb b/app/services/ci/job_artifacts/bulk_delete_by_project_service.rb
new file mode 100644
index 00000000000..7862774473c
--- /dev/null
+++ b/app/services/ci/job_artifacts/bulk_delete_by_project_service.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Ci
+  module JobArtifacts
+    class BulkDeleteByProjectService
+      include BaseServiceUtility
+
+      JOB_ARTIFACTS_COUNT_LIMIT = 50
+
+      def initialize(job_artifact_ids:, project:, current_user:)
+        @job_artifact_ids = job_artifact_ids
+        @project = project
+        @current_user = current_user
+      end
+
+      def execute
+        if exceeds_limits?
+          return ServiceResponse.error(
+            message: "Can only delete up to #{JOB_ARTIFACTS_COUNT_LIMIT} job artifacts per call"
+          )
+        end
+
+        find_result = find_artifacts
+
+        return ServiceResponse.error(message: find_result[:error_message]) if find_result[:error_message]
+
+        @job_artifact_scope = find_result[:scope]
+
+        unless all_job_artifacts_belong_to_project?
+          return ServiceResponse.error(message: 'Not all artifacts belong to requested project')
+        end
+
+        result = Ci::JobArtifacts::DestroyBatchService.new(
+          job_artifact_scope,
+          skip_trace_artifacts: false
+        ).execute
+
+        destroyed_artifacts_count = result.fetch(:destroyed_artifacts_count)
+        destroyed_ids = result.fetch(:destroyed_ids)
+
+        ServiceResponse.success(
+          payload: {
+            destroyed_count: destroyed_artifacts_count,
+            destroyed_ids: destroyed_ids,
+            errors: []
+          })
+      end
+
+      private
+
+      def find_artifacts
+        job_artifacts = ::Ci::JobArtifact.id_in(job_artifact_ids)
+
+        error_message = nil
+        if job_artifacts.count != job_artifact_ids.count
+          not_found_artifacts = job_artifact_ids - job_artifacts.map(&:id)
+          error_message = "Artifacts (#{not_found_artifacts.join(',')}) not found"
+        end
+
+        { scope: job_artifacts, error_message: error_message }
+      end
+
+      def exceeds_limits?
+        job_artifact_ids.count > JOB_ARTIFACTS_COUNT_LIMIT
+      end
+
+      def all_job_artifacts_belong_to_project?
+        # rubocop:disable CodeReuse/ActiveRecord
+        job_artifact_scope.pluck(:project_id).all?(project.id)
+        # rubocop:enable CodeReuse/ActiveRecord
+      end
+
+      attr_reader :job_artifact_ids, :job_artifact_scope, :current_user, :project
+    end
+  end
+end
diff --git a/app/services/ci/job_artifacts/destroy_batch_service.rb b/app/services/ci/job_artifacts/destroy_batch_service.rb
index 7cb1be95a3e..94ecfa96be0 100644
--- a/app/services/ci/job_artifacts/destroy_batch_service.rb
+++ b/app/services/ci/job_artifacts/destroy_batch_service.rb
@@ -17,10 +17,12 @@ module Ci
       # +pick_up_at+:: When to pick up for deletion of files
       # Returns:
       # +Hash+:: A hash with status and destroyed_artifacts_count keys
-      def initialize(job_artifacts, pick_up_at: nil, skip_projects_on_refresh: false)
+      def initialize(job_artifacts, pick_up_at: nil, skip_projects_on_refresh: false, skip_trace_artifacts: true)
         @job_artifacts = job_artifacts.with_destroy_preloads.to_a
         @pick_up_at = pick_up_at
         @skip_projects_on_refresh = skip_projects_on_refresh
+        @skip_trace_artifacts = skip_trace_artifacts
+        @destroyed_ids = []
       end
 
       # rubocop: disable CodeReuse/ActiveRecord
@@ -31,16 +33,19 @@ module Ci
           track_artifacts_undergoing_stats_refresh
         end
 
-        exclude_trace_artifacts
+        exclude_trace_artifacts if @skip_trace_artifacts
 
-        return success(destroyed_artifacts_count: 0, statistics_updates: {}) if @job_artifacts.empty?
+        if @job_artifacts.empty?
+          return success(destroyed_ids: @destroyed_ids, destroyed_artifacts_count: 0, statistics_updates: {})
+        end
 
         destroy_related_records(@job_artifacts)
 
         destroy_around_hook(@job_artifacts) do
+          @destroyed_ids = @job_artifacts.map(&:id)
           Ci::DeletedObject.transaction do
             Ci::DeletedObject.bulk_import(@job_artifacts, @pick_up_at)
-            Ci::JobArtifact.id_in(@job_artifacts.map(&:id)).delete_all
+            Ci::JobArtifact.id_in(@destroyed_ids).delete_all
           end
         end
 
@@ -52,7 +57,11 @@ module Ci
 
         Gitlab::Ci::Artifacts::Logger.log_deleted(@job_artifacts, 'Ci::JobArtifacts::DestroyBatchService#execute')
 
-        success(destroyed_artifacts_count: artifacts_count, statistics_updates: statistics_updates_per_project)
+        success(
+          destroyed_ids: @destroyed_ids,
+          destroyed_artifacts_count: artifacts_count,
+          statistics_updates: statistics_updates_per_project
+        )
       end
       # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 6d09dcb647c..dd84b303655 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -64,7 +64,7 @@
 
           - if @user.pronunciation.present?
             .gl-align-items-center
-              %p.gl-mb-4.gl-text-gray-500= s_("UserProfile|Pronounced as: %{pronunciation}") % { pronunciation: @user.pronunciation }
+              %p.gl-mb-4.gl-text-gray-500.gl-max-w-80.gl-mx-auto= s_("UserProfile|Pronounced as: %{pronunciation}") % { pronunciation: @user.pronunciation }
 
           - if @user.status&.customized?
             .cover-status.gl-display-inline-flex.gl-align-items-center
diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb
index e2e31b0a5bd..ce77592daac 100644
--- a/app/workers/concerns/application_worker.rb
+++ b/app/workers/concerns/application_worker.rb
@@ -11,6 +11,7 @@ module ApplicationWorker
   include WorkerAttributes
   include WorkerContext
   include Gitlab::SidekiqVersioning::Worker
+  include Gitlab::Loggable
 
   LOGGING_EXTRA_KEY = 'extra'
   SAFE_PUSH_BULK_LIMIT = 1000
@@ -28,7 +29,7 @@ module ApplicationWorker
         'jid' => jid
       )
 
-      payload.stringify_keys.merge(context)
+      build_structured_payload(**payload).merge(context)
     end
 
     def log_extra_metadata_on_done(key, value)
diff --git a/config/feature_flags/development/ci_job_artifact_bulk_destroy.yml b/config/feature_flags/development/ci_job_artifact_bulk_destroy.yml
new file mode 100644
index 00000000000..a99c892020f
--- /dev/null
+++ b/config/feature_flags/development/ci_job_artifact_bulk_destroy.yml
@@ -0,0 +1,8 @@
+---
+name: ci_job_artifact_bulk_destroy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110026
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386768
+milestone: '15.10'
+type: development
+group: group::pipeline security
+default_enabled: false
diff --git a/config/feature_flags/development/create_runner_workflow.yml b/config/feature_flags/development/create_runner_workflow_for_admin.yml
index 1a0c8b3e847..8fd9c350ff5 100644
--- a/config/feature_flags/development/create_runner_workflow.yml
+++ b/config/feature_flags/development/create_runner_workflow_for_admin.yml
@@ -1,5 +1,5 @@
 ---
-name: create_runner_workflow
+name: create_runner_workflow_for_admin
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109497
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389269
 milestone: '15.9'
diff --git a/data/deprecations/15-6-deprecate-post-api-v4-runner.yml b/data/deprecations/15-6-deprecate-post-api-v4-runner.yml
index f71b8726de9..b841451b1d1 100644
--- a/data/deprecations/15-6-deprecate-post-api-v4-runner.yml
+++ b/data/deprecations/15-6-deprecate-post-api-v4-runner.yml
@@ -1,6 +1,7 @@
 - title: "Registration tokens and server-side runner arguments in `POST /api/v4/runners` endpoint"  # (required) The name of the feature to be deprecated
   announcement_milestone: "15.6"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2024-04-22"
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: pedropombeiro  # (required) GitLab username of the person reporting the deprecation
   stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
@@ -11,11 +12,12 @@
     with a GitLab instance at the instance, group, or project level through the API. We plan to remove the support for
     registration tokens and certain configuration arguments in this endpoint in GitLab 17.0.
 
-    In GitLab 15.10, we plan to implement a new method to bind runners to a GitLab instance,
+    We plan to implement a new method to bind runners to a GitLab instance
     as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+    The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
     This new architecture introduces a new method for registering runners and will eliminate the legacy
     [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
     From GitLab 17.0 and later, the runner registration methods implemented by the new GitLab Runner token architecture will be the only supported methods.
-  end_of_support_milestone: "16.6"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  end_of_support_milestone: "17.0"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
   tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
   documentation_url: https://docs.gitlab.com/ee/api/runners.html#register-a-new-runner  # (optional) This is a link to the current documentation page
diff --git a/data/deprecations/15-6-deprecate-runner-reg-token-helm.yml b/data/deprecations/15-6-deprecate-runner-reg-token-helm.yml
index cbc50918c39..a01c995ae4f 100644
--- a/data/deprecations/15-6-deprecate-runner-reg-token-helm.yml
+++ b/data/deprecations/15-6-deprecate-runner-reg-token-helm.yml
@@ -1,6 +1,7 @@
 - title: "`runnerRegistrationToken` parameter for GitLab Runner Helm Chart"  # (required) The name of the feature to be deprecated
   announcement_milestone: "15.6"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2024-04-22"
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: pedropombeiro  # (required) GitLab username of the person reporting the deprecation
   stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
@@ -8,10 +9,9 @@
   body: |  # (required) Do not modify this line, instead modify the lines below.
     The [`runnerRegistrationToken`](https://docs.gitlab.com/runner/install/kubernetes.html#required-configuration) parameter to use the GitLab Helm Chart to install a runner on Kubernetes is deprecated.
 
-    As part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/), in GitLab 15.8 we plan to introduce:
-
-    - A new method to bind runners to a GitLab instance leveraging `runnerToken`.
-    - A unique system ID saved to the `config.toml`, which will ensure traceability between jobs and runners.
+    We plan to implement a new method to bind runners to a GitLab instance leveraging `runnerToken`
+    as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+    The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
 
     From GitLab 17.0 and later, the methods to register runners introduced by the new GitLab Runner token architecture will be the only supported methods.
-  end_of_support_milestone: "16.6"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  end_of_support_milestone: "17.0"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
diff --git a/data/deprecations/15-6-deprecate-runner-register-command.yml b/data/deprecations/15-6-deprecate-runner-register-command.yml
index a908e126bc8..1311451abb8 100644
--- a/data/deprecations/15-6-deprecate-runner-register-command.yml
+++ b/data/deprecations/15-6-deprecate-runner-register-command.yml
@@ -1,16 +1,17 @@
 - title: "Registration tokens and server-side runner arguments in `gitlab-runner register` command"  # (required) The name of the feature to be deprecated
   announcement_milestone: "15.6"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2024-04-22"
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: pedropombeiro  # (required) GitLab username of the person reporting the deprecation
   stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/380872  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
     The support for registration tokens and certain configuration arguments in the command to [register](https://docs.gitlab.com/runner/register/) a runner, `gitlab-runner register` is deprecated.
-    GitLab plans to introduce a new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/) in GitLab 15.10,
-    which introduces a new method for registering runners and eliminates the legacy
-    [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
+    We plan to implement a new method to bind runners to a GitLab instance
+    as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+    The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
     The new method will involve creating the runner in the GitLab UI and passing the
     [runner authentication token](https://docs.gitlab.com/ee/security/token_overview.html#runner-authentication-tokens-also-called-runner-tokens)
     to the `gitlab-runner register` command.
-  end_of_support_milestone: "16.6"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  end_of_support_milestone: "17.0"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
diff --git a/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml b/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml
index 7b66978f492..56d40620047 100644
--- a/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml
+++ b/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml
@@ -1,13 +1,17 @@
 - title: "GitLab Runner registration token in Runner Operator"  # (required) The name of the feature to be deprecated
   announcement_milestone: "15.6"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2024-04-22"
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: ratchade  # (required) GitLab username of the person reporting the deprecation
   stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382077  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
-    The [`runner-registration-token`](https://docs.gitlab.com/runner/install/operator.html#install-the-kubernetes-operator) parameter that uses the OpenShift and k8s Vanilla Operator to install a runner on Kubernetes is deprecated. GitLab plans to introduce a new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/) in GitLab 15.8, which introduces a new method for registering runners and eliminates the legacy runner registration token.
-  end_of_support_milestone: "16.6"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+    The [`runner-registration-token`](https://docs.gitlab.com/runner/install/operator.html#install-the-kubernetes-operator) parameter that uses the OpenShift and k8s Vanilla Operator to install a runner on Kubernetes is deprecated.
+    We plan to implement a new method to bind runners to a GitLab instance
+    as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+    The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
+  end_of_support_milestone: "17.0"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
   tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
   documentation_url: https://docs.gitlab.com/runner/install/operator.html#install-the-kubernetes-operator  # (optional) This is a link to the current documentation page
   image_url:  # (optional) This is a link to a thumbnail image depicting the feature
diff --git a/data/deprecations/15-7-deprecate-api-v4-runner-registration-token-reset-endpoints.yml b/data/deprecations/15-7-deprecate-api-v4-runner-registration-token-reset-endpoints.yml
index 25b2e046f01..b3031850ca3 100644
--- a/data/deprecations/15-7-deprecate-api-v4-runner-registration-token-reset-endpoints.yml
+++ b/data/deprecations/15-7-deprecate-api-v4-runner-registration-token-reset-endpoints.yml
@@ -1,6 +1,7 @@
 - title: "Support for REST API endpoints that reset runner registration tokens"  # (required) The name of the feature to be deprecated
   announcement_milestone: "15.7"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2024-04-22"
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: pedropombeiro  # (required) GitLab username of the person reporting the deprecation
   stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
@@ -14,11 +15,12 @@
     - `POST /projects/:id/runners/reset_registration_token`
     - `POST /groups/:id/runners/reset_registration_token`
 
-    In GitLab 15.8, we plan to implement a new method to bind runners to a GitLab instance,
+    We plan to implement a new method to bind runners to a GitLab instance
     as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+    The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
     This new architecture introduces a new method for registering runners and will eliminate the legacy
     [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
     From GitLab 17.0 and later, the runner registration methods implemented by the new GitLab Runner token architecture will be the only supported methods.
-  end_of_support_milestone: "16.6"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  end_of_support_milestone: "17.0"  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
   tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
   documentation_url: https://docs.gitlab.com/ee/api/runners.html#register-a-new-runner  # (optional) This is a link to the current documentation page
diff --git a/data/deprecations/15-9-deprecate-option-to-remove-project-immediately.yml b/data/deprecations/15-9-deprecate-option-to-remove-project-immediately.yml
index 687270fbb71..3c5cc4901ab 100644
--- a/data/deprecations/15-9-deprecate-option-to-remove-project-immediately.yml
+++ b/data/deprecations/15-9-deprecate-option-to-remove-project-immediately.yml
@@ -6,8 +6,8 @@
   stage: manage  # (required) String value of the stage that the feature was created in. e.g., Growth
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389557  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
-    The project deletion protection setting in the Admin Area had an option to delete projects immediately. Starting with 16.0, this option will no longer be available, and delayed project deletion will become the default behavior.
+    The group and project deletion protection setting in the Admin Area had an option to delete groups and projects immediately. Starting with 16.0, this option will no longer be available, and delayed group and project deletion will become the default behavior.
 
-    The option will no longer appear as a group setting. Self-managed users will still have the option to define the deletion delay period, and SaaS users have a non-adjustable default retention period of 7 days. Users can still delete the project immediately from the project settings.
+    The option will no longer appear as a group setting. Self-managed users will still have the option to define the deletion delay period, and SaaS users have a non-adjustable default retention period of 7 days. Users can still immediately delete the project from the project settings, and the group from the group settings.
 
-    The option to delete projects immediately by default was deprecated to prevent users from accidentally taking this action and permanently losing projects.
+    The option to delete groups and projects immediately by default was deprecated to prevent users from accidentally taking this action and permanently losing groups and projects.
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 57d92512e8a..1ce6c1784a2 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1192,6 +1192,31 @@ Input type: `BoardListUpdateLimitMetricsInput`
 | <a id="mutationboardlistupdatelimitmetricserrors"></a>`errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. |
 | <a id="mutationboardlistupdatelimitmetricslist"></a>`list` | [`BoardList`](#boardlist) | Updated list. |
 
+### `Mutation.bulkDestroyJobArtifacts`
+
+WARNING:
+**Introduced** in 15.10.
+This feature is in Alpha. It can be changed or removed at any time.
+
+Input type: `BulkDestroyJobArtifactsInput`
+
+#### Arguments
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="mutationbulkdestroyjobartifactsclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
+| <a id="mutationbulkdestroyjobartifactsids"></a>`ids` | [`[CiJobArtifactID!]!`](#cijobartifactid) | Global IDs of the job artifacts to destroy. |
+| <a id="mutationbulkdestroyjobartifactsprojectid"></a>`projectId` | [`ProjectID!`](#projectid) | Global Project ID of the job artifacts to destroy. Incompatible with projectPath. |
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="mutationbulkdestroyjobartifactsclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
+| <a id="mutationbulkdestroyjobartifactsdestroyedcount"></a>`destroyedCount` | [`Int`](#int) | Number of job artifacts deleted. |
+| <a id="mutationbulkdestroyjobartifactsdestroyedids"></a>`destroyedIds` | [`[CiJobArtifactID!]`](#cijobartifactid) | IDs of job artifacts that were deleted. |
+| <a id="mutationbulkdestroyjobartifactserrors"></a>`errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. |
+
 ### `Mutation.bulkEnableDevopsAdoptionNamespaces`
 
 **BETA** This endpoint is subject to change without notice.
diff --git a/doc/architecture/blueprints/runner_tokens/index.md b/doc/architecture/blueprints/runner_tokens/index.md
index 8c9c8f63dae..c6e1e143e96 100644
--- a/doc/architecture/blueprints/runner_tokens/index.md
+++ b/doc/architecture/blueprints/runner_tokens/index.md
@@ -376,7 +376,7 @@ scope.
 | GitLab Rails app | `%15.9` | Implement the `create_runner_machine` [feature flag](../../../administration/feature_flags.md). |
 | GitLab Rails app | `%15.9` | Create `ci_runner_machines` record in `POST /runners/verify` request if the runner token is prefixed with `glrt-`. |
 | GitLab Rails app | `%15.9` | Use runner token + `system_id` JSON parameters in `POST /jobs/request` request in the [heartbeat request](https://gitlab.com/gitlab-org/gitlab/blob/c73c96a8ffd515295842d72a3635a8ae873d688c/lib/api/ci/helpers/runner.rb#L14-20) to update the `ci_runner_machines` cache/table. |
-| GitLab Rails app | `%15.9` | Implement the `create_runner_workflow`  [feature flag](../../../administration/feature_flags.md). |
+| GitLab Rails app | `%15.9` | Implement the `create_runner_workflow_for_admin`  [feature flag](../../../administration/feature_flags.md). |
 | GitLab Rails app | `%15.9` | Implement `create_{instance|group|project}_runner` permissions. |
 | GitLab Rails app | `%15.9` | Rename `ci_runner_machines.machine_xid` column to `system_xid` to be consistent with `system_id` passed in APIs. |
 | GitLab Rails app | `%15.10` | Remove the ignore rule for `ci_runner_machines.machine_xid` column. |
@@ -503,7 +503,7 @@ gitlab-runner register
     --executor "shell" \
     --url "https://gitlab.com/" \
     --non-interactive \
-    --registration-token="grlt-2CR8_eVxiioB1QmzPZwa"
+    --registration-token="glrt-2CR8_eVxiioB1QmzPZwa"
 ```
 
 ### How does this change impact auto-scaling scenarios?
diff --git a/doc/development/logging.md b/doc/development/logging.md
index 5b9a311c704..6840445a0a5 100644
--- a/doc/development/logging.md
+++ b/doc/development/logging.md
@@ -169,6 +169,28 @@ Resources:
 - [Elasticsearch mapping - avoiding type gotchas](https://www.elastic.co/guide/en/elasticsearch/guide/current/mapping.html#_avoiding_type_gotchas)
 - [Elasticsearch mapping types]( https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html)
 
+#### Include a class attribute
+
+Structured logs should always include a `class` attribute to make all entries logged from a particular place in the code findable.
+To automatically add the `class` attribute, you can include the
+[`Gitlab::Loggable` module](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/loggable.rb) and use the `build_structured_payload` method.
+
+```ruby
+class MyClass
+  include ::Gitlab::Loggable
+
+  def my_method
+    logger.info(build_structured_payload(message: 'log message', project_id: project_id))
+  end
+
+  private
+
+  def logger
+    @logger ||= Gitlab::AppJsonLogger.build
+  end
+end
+```
+
 #### Logging durations
 
 Similar to timezones, choosing the right time unit to log can impose avoidable overhead. So, whenever
diff --git a/doc/integration/jira/issues.md b/doc/integration/jira/issues.md
index d110ea4b7a1..58da871926b 100644
--- a/doc/integration/jira/issues.md
+++ b/doc/integration/jira/issues.md
@@ -47,12 +47,11 @@ You can [disable comments](#disable-comments-on-jira-issues) on issues.
 
 ### Require associated Jira issue for merge requests to be merged **(ULTIMATE)**
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/280766) in GitLab 13.12, disabled behind `jira_issue_association_on_merge_request` [feature flag](../../administration/feature_flags.md).
-> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61722) in GitLab 14.1.
-> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/335280) in GitLab 14.2.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/280766) in GitLab 13.12 [with a flag](../../administration/feature_flags.md) named `jira_issue_association_on_merge_request`. Disabled by default.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/335280) in GitLab 14.2. Feature flag `jira_issue_association_on_merge_request` removed.
 
-You can prevent merge requests from being merged if they do not refer to a Jira issue.
-To enforce this:
+With this integration, you can prevent merge requests from being merged if they do not refer to a Jira issue.
+To enable this feature:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
 1. On the left sidebar, select **Settings > Merge requests**.
diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md
index a36d72f128d..b349eee9837 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -77,7 +77,7 @@ Project maintainers and owners can add or enable a deploy key for a project repo
 ## Runner registration tokens (deprecated)
 
 WARNING:
-The ability to pass a runner registration token was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) in GitLab 15.6 and is
+The ability to pass a runner registration token has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) and is
 planned for removal in 17.0, along with support for certain configuration arguments. This change is a breaking change. GitLab plans to introduce a new
 [GitLab Runner token architecture](../architecture/blueprints/runner_tokens/index.md), which introduces
 a new method for registering runners and eliminates the
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index f1ab77e3071..1788d503a54 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -464,11 +464,11 @@ WARNING:
 This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
 Review the details carefully before upgrading.
 
-The project deletion protection setting in the Admin Area had an option to delete projects immediately. Starting with 16.0, this option will no longer be available, and delayed project deletion will become the default behavior.
+The group and project deletion protection setting in the Admin Area had an option to delete groups and projects immediately. Starting with 16.0, this option will no longer be available, and delayed group and project deletion will become the default behavior.
 
-The option will no longer appear as a group setting. Self-managed users will still have the option to define the deletion delay period, and SaaS users have a non-adjustable default retention period of 7 days. Users can still delete the project immediately from the project settings.
+The option will no longer appear as a group setting. Self-managed users will still have the option to define the deletion delay period, and SaaS users have a non-adjustable default retention period of 7 days. Users can still immediately delete the project from the project settings, and the group from the group settings.
 
-The option to delete projects immediately by default was deprecated to prevent users from accidentally taking this action and permanently losing projects.
+The option to delete groups and projects immediately by default was deprecated to prevent users from accidentally taking this action and permanently losing groups and projects.
 
 </div>
 
@@ -1356,7 +1356,7 @@ The endpoint to get [changes from a single merge request](https://docs.gitlab.co
 
 ### Support for REST API endpoints that reset runner registration tokens
 
-End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">17.0</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1371,8 +1371,9 @@ The deprecated endpoints are:
 - `POST /projects/:id/runners/reset_registration_token`
 - `POST /groups/:id/runners/reset_registration_token`
 
-In GitLab 15.8, we plan to implement a new method to bind runners to a GitLab instance,
+We plan to implement a new method to bind runners to a GitLab instance
 as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
 This new architecture introduces a new method for registering runners and will eliminate the legacy
 [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
 From GitLab 17.0 and later, the runner registration methods implemented by the new GitLab Runner token architecture will be the only supported methods.
@@ -1487,14 +1488,17 @@ From GitLab 13.6, users can [specify any runner configuration in the GitLab Runn
 
 ### GitLab Runner registration token in Runner Operator
 
-End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">17.0</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
 This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
 Review the details carefully before upgrading.
 
-The [`runner-registration-token`](https://docs.gitlab.com/runner/install/operator.html#install-the-kubernetes-operator) parameter that uses the OpenShift and k8s Vanilla Operator to install a runner on Kubernetes is deprecated. GitLab plans to introduce a new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/) in GitLab 15.8, which introduces a new method for registering runners and eliminates the legacy runner registration token.
+The [`runner-registration-token`](https://docs.gitlab.com/runner/install/operator.html#install-the-kubernetes-operator) parameter that uses the OpenShift and k8s Vanilla Operator to install a runner on Kubernetes is deprecated.
+We plan to implement a new method to bind runners to a GitLab instance
+as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
 
 </div>
 
@@ -1502,7 +1506,7 @@ The [`runner-registration-token`](https://docs.gitlab.com/runner/install/operato
 
 ### Registration tokens and server-side runner arguments in `POST /api/v4/runners` endpoint
 
-End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">17.0</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1514,8 +1518,9 @@ This endpoint [registers](https://docs.gitlab.com/ee/api/runners.html#register-a
 with a GitLab instance at the instance, group, or project level through the API. We plan to remove the support for
 registration tokens and certain configuration arguments in this endpoint in GitLab 17.0.
 
-In GitLab 15.10, we plan to implement a new method to bind runners to a GitLab instance,
+We plan to implement a new method to bind runners to a GitLab instance
 as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
 This new architecture introduces a new method for registering runners and will eliminate the legacy
 [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
 From GitLab 17.0 and later, the runner registration methods implemented by the new GitLab Runner token architecture will be the only supported methods.
@@ -1526,7 +1531,7 @@ From GitLab 17.0 and later, the runner registration methods implemented by the n
 
 ### Registration tokens and server-side runner arguments in `gitlab-runner register` command
 
-End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">17.0</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1534,9 +1539,9 @@ This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_g
 Review the details carefully before upgrading.
 
 The support for registration tokens and certain configuration arguments in the command to [register](https://docs.gitlab.com/runner/register/) a runner, `gitlab-runner register` is deprecated.
-GitLab plans to introduce a new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/) in GitLab 15.10,
-which introduces a new method for registering runners and eliminates the legacy
-[runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
+We plan to implement a new method to bind runners to a GitLab instance
+as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
 The new method will involve creating the runner in the GitLab UI and passing the
 [runner authentication token](https://docs.gitlab.com/ee/security/token_overview.html#runner-authentication-tokens-also-called-runner-tokens)
 to the `gitlab-runner register` command.
@@ -1547,7 +1552,7 @@ to the `gitlab-runner register` command.
 
 ### `runnerRegistrationToken` parameter for GitLab Runner Helm Chart
 
-End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">17.0</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1556,10 +1561,9 @@ Review the details carefully before upgrading.
 
 The [`runnerRegistrationToken`](https://docs.gitlab.com/runner/install/kubernetes.html#required-configuration) parameter to use the GitLab Helm Chart to install a runner on Kubernetes is deprecated.
 
-As part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/), in GitLab 15.8 we plan to introduce:
-
-- A new method to bind runners to a GitLab instance leveraging `runnerToken`.
-- A unique system ID saved to the `config.toml`, which will ensure traceability between jobs and runners.
+We plan to implement a new method to bind runners to a GitLab instance leveraging `runnerToken`
+as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
+The work is planned in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
 
 From GitLab 17.0 and later, the methods to register runners introduced by the new GitLab Runner token architecture will be the only supported methods.
 
diff --git a/doc/user/compliance/compliance_report/index.md b/doc/user/compliance/compliance_report/index.md
index 18261ac1fae..6415cdeaf05 100644
--- a/doc/user/compliance/compliance_report/index.md
+++ b/doc/user/compliance/compliance_report/index.md
@@ -5,7 +5,11 @@ group: Compliance
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Compliance report **(ULTIMATE)**
+# Compliance reports **(ULTIMATE)**
+
+See reports about compliance violations and compliance frameworks for the group.
+
+## Compliance violations report
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/36524) in GitLab 12.8 as Compliance Dashboard.
 > - Compliance violation drawer [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299357) in GitLab 14.1.
@@ -13,11 +17,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Replaced](https://gitlab.com/groups/gitlab-org/-/epics/5237) by merge request violations in GitLab 14.6 [with a flag](../../../administration/feature_flags.md) named `compliance_violations_report`. Disabled by default.
 > - GraphQL API [introduced](https://gitlab.com/groups/gitlab-org/-/epics/7222) in GitLab 14.9.
 > - [Generally available](https://gitlab.com/groups/gitlab-org/-/epics/5237) in GitLab 14.10. [Feature flag `compliance_violations_report`](https://gitlab.com/gitlab-org/gitlab/-/issues/346266) removed.
+> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112111) to compliance violations report in GitLab 15.9.
 
-With a compliance report, you can:
-
-- List compliance violations from all merge requests merged in projects in a group.
-- See the reason and severity of each compliance violation.
+With compliance violations report, you can see a high-level view of merge request activity for all projects in the group.
 
 When you select a row in the compliance report, a drawer appears that provides:
 
@@ -30,13 +32,13 @@ When you select a row in the compliance report, a drawer appears that provides:
 - A list of users that approved the merge request.
 - The user that merged the merge request.
 
-## View the compliance report for a group
+### View the compliance violations report for a group
 
 Prerequisites:
 
 - You must be an administrator or have the Owner role for the group.
 
-To view the compliance report:
+To view the compliance violations report:
 
 1. On the top bar, select **Main menu > Groups** and find your group.
 1. On the left sidebar, select **Security and Compliance > Compliance report**.
@@ -49,7 +51,7 @@ You can sort the compliance report on:
 
 Select a row to see details of the compliance violation.
 
-### Severity levels
+#### Severity levels
 
 Each compliance violation has one of the following severities.
 
@@ -65,7 +67,7 @@ Each compliance violation has one of the following severities.
 
 <!-- vale gitlab.SubstitutionWarning = YES -->
 
-### Violation types
+#### Violation types
 
 From [GitLab 14.10](https://gitlab.com/groups/gitlab-org/-/epics/6870), these are the available compliance violations.
 
@@ -90,7 +92,7 @@ The following are unavailable compliance violations that are tracked in [issue 3
 
 <!-- vale gitlab.SubstitutionWarning = YES -->
 
-#### Separation of duties
+##### Separation of duties
 
 GitLab supports a separation of duties policy between users who create and approve merge requests. Our criteria for the
 separation of duties is:
@@ -99,7 +101,7 @@ separation of duties is:
 - [A merge request committer is **not** allowed to approve a merge request they have added commits to](../../project/merge_requests/approvals/settings.md#prevent-approvals-by-users-who-add-commits).
 - [The minimum number of approvals required to merge a merge request is **at least** two](../../project/merge_requests/approvals/rules.md).
 
-## Chain of Custody report
+### Chain of Custody report
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213364) in GitLab 13.3.
 > - Chain of Custody reports sent using email [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342594) in GitLab 15.3 with a flag named `async_chain_of_custody_report`. Disabled by default.
@@ -135,7 +137,7 @@ If the commit has a related merge commit, then the following are also included:
 - Pipeline ID.
 - Merge request approvers.
 
-### Generate Chain of Custody report
+#### Generate Chain of Custody report
 
 To generate the Chain of Custody report:
 
@@ -145,7 +147,7 @@ To generate the Chain of Custody report:
 
 Depending on your version of GitLab, the Chain of Custody report is either sent through email or available for download.
 
-### Generate commit-specific Chain of Custody report
+#### Generate commit-specific Chain of Custody report
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/267629) in GitLab 13.6.
 
@@ -165,3 +167,31 @@ Depending on your version of GitLab, the Chain of Custody report is either sent
 
 Alternatively, use a direct link: `https://gitlab.com/groups/<group-name>/-/security/merge_commit_reports.csv?commit_sha={optional_commit_sha}`,
 passing in an optional value to the `commit_sha` query parameter.
+
+## Compliance frameworks report
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/387910) in GitLab 15.10 with a flag named `compliance_frameworks_report`. Disabled by default.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `compliance_frameworks_report`.
+On GitLab.com, this feature is not available.
+
+With compliance frameworks report, you can see the compliance frameworks that are applied to projects in a group. Each row of the report shows:
+
+- Project name.
+- Project path.
+- Compliance framework label if the project has one assigned.
+
+The default framework for the group has a **default** badge.
+
+### View the compliance frameworks report for a group
+
+Prerequisites:
+
+- You must be an administrator or have the Owner role for the group.
+
+To view the compliance frameworks report:
+
+1. On the top bar, select **Main menu > Groups** and find your group.
+1. On the left sidebar, select **Security & Compliance > Compliance report**.
+1. On the page, select the **Frameworks** tab.
diff --git a/lib/gitlab/loggable.rb b/lib/gitlab/loggable.rb
new file mode 100644
index 00000000000..393e3eb37b6
--- /dev/null
+++ b/lib/gitlab/loggable.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Loggable
+    ANONYMOUS = '<Anonymous>'
+
+    def build_structured_payload(**params)
+      { class: self.class.name || ANONYMOUS }.merge(params).stringify_keys
+    end
+  end
+end
diff --git a/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter.rb
index 8a57a0331b8..b30c4b675f9 100644
--- a/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter.rb
@@ -4,7 +4,9 @@ module Gitlab
   module UsageDataCounters
     module GitLabCliActivityUniqueCounter
       GITLAB_CLI_API_REQUEST_ACTION = 'i_code_review_user_gitlab_cli_api_request'
-      GITLAB_CLI_USER_AGENT_REGEX = /GitLab\sCLI$/.freeze
+
+      # This regex will match to user agents ending with GitLab CLI or starting with glab/v"
+      GITLAB_CLI_USER_AGENT_REGEX = %r{(GitLab\sCLI$|^glab/v)}.freeze
 
       class << self
         def track_api_request_when_trackable(user_agent:, user:)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index bd2521d60c4..a4d914797cf 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10489,6 +10489,9 @@ msgstr ""
 msgid "Compliance report"
 msgstr ""
 
+msgid "Compliance violations and compliance frameworks for the group."
+msgstr ""
+
 msgid "ComplianceFrameworks|Add framework"
 msgstr ""
 
@@ -10606,6 +10609,9 @@ msgstr ""
 msgid "ComplianceReport|No violations found"
 msgstr ""
 
+msgid "ComplianceReport|Retrieving the compliance framework report failed. Refresh the page and try again."
+msgstr ""
+
 msgid "ComplianceReport|Unable to load the compliance framework report. Refresh the page and try again."
 msgstr ""
 
@@ -43098,9 +43104,6 @@ msgstr ""
 msgid "The complete DevOps platform. One application with endless possibilities. Organizations rely on GitLab’s source code management, CI/CD, security, and more to deliver software rapidly."
 msgstr ""
 
-msgid "The compliance report shows the merge request violations merged in protected environments."
-msgstr ""
-
 msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
 msgstr ""
 
diff --git a/package.json b/package.json
index 2f6732ccc0b..c5976b96ce3 100644
--- a/package.json
+++ b/package.json
@@ -207,7 +207,7 @@
     "yaml": "^2.0.0-10"
   },
   "devDependencies": {
-    "@gitlab/eslint-plugin": "18.1.0",
+    "@gitlab/eslint-plugin": "18.2.0",
     "@gitlab/stylelint-config": "4.1.0",
     "@graphql-eslint/eslint-plugin": "3.12.0",
     "@testing-library/dom": "^7.16.2",
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index 9555caf24db..b1a2d90589a 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -35,22 +35,16 @@ RSpec.describe Admin::RunnersController, feature_category: :runner_fleet do
   end
 
   describe '#new' do
-    context 'when create_runner_workflow is enabled' do
-      before do
-        stub_feature_flags(create_runner_workflow: true)
-      end
+    it 'renders a :new template' do
+      get :new
 
-      it 'renders a :new template' do
-        get :new
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(response).to render_template(:new)
-      end
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to render_template(:new)
     end
 
-    context 'when create_runner_workflow is disabled' do
+    context 'when create_runner_workflow_for_admin is disabled' do
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
       end
 
       it 'returns :not_found' do
@@ -64,38 +58,32 @@ RSpec.describe Admin::RunnersController, feature_category: :runner_fleet do
   describe '#register' do
     subject(:register) { get :register, params: { id: new_runner.id } }
 
-    context 'when create_runner_workflow is enabled' do
-      before do
-        stub_feature_flags(create_runner_workflow: true)
-      end
-
-      context 'when runner can be registered after creation' do
-        let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
+    context 'when runner can be registered after creation' do
+      let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
 
-        it 'renders a :register template' do
-          register
+      it 'renders a :register template' do
+        register
 
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response).to render_template(:register)
-        end
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to render_template(:register)
       end
+    end
 
-      context 'when runner cannot be registered after creation' do
-        let_it_be(:new_runner) { runner }
+    context 'when runner cannot be registered after creation' do
+      let_it_be(:new_runner) { runner }
 
-        it 'returns :not_found' do
-          register
+      it 'returns :not_found' do
+        register
 
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
-    context 'when create_runner_workflow is disabled' do
+    context 'when create_runner_workflow_for_admin is disabled' do
       let_it_be(:new_runner) { create(:ci_runner, registration_type: :authenticated_user) }
 
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
       end
 
       it 'returns :not_found' do
diff --git a/spec/controllers/graphql_controller_spec.rb b/spec/controllers/graphql_controller_spec.rb
index be5dd4f961a..cd72dbe394a 100644
--- a/spec/controllers/graphql_controller_spec.rb
+++ b/spec/controllers/graphql_controller_spec.rb
@@ -208,14 +208,28 @@ RSpec.describe GraphqlController, feature_category: :integrations do
         post :execute
       end
 
-      it 'calls the track gitlab cli when trackable method' do
-        agent = 'GLab - GitLab CLI'
-        request.env['HTTP_USER_AGENT'] = agent
+      context 'if using the GitLab CLI' do
+        it 'call trackable for the old UserAgent' do
+          agent = 'GLab - GitLab CLI'
 
-        expect(Gitlab::UsageDataCounters::GitLabCliActivityUniqueCounter)
-          .to receive(:track_api_request_when_trackable).with(user_agent: agent, user: user)
+          request.env['HTTP_USER_AGENT'] = agent
 
-        post :execute
+          expect(Gitlab::UsageDataCounters::GitLabCliActivityUniqueCounter)
+            .to receive(:track_api_request_when_trackable).with(user_agent: agent, user: user)
+
+          post :execute
+        end
+
+        it 'call trackable for the current UserAgent' do
+          agent = 'glab/v1.25.3-27-g7ec258fb (built 2023-02-16), darwin'
+
+          request.env['HTTP_USER_AGENT'] = agent
+
+          expect(Gitlab::UsageDataCounters::GitLabCliActivityUniqueCounter)
+            .to receive(:track_api_request_when_trackable).with(user_agent: agent, user: user)
+
+          post :execute
+        end
       end
 
       it "assigns username in ApplicationContext" do
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 04dc206f052..c22517538cc 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -23,8 +23,6 @@ RSpec.describe "Admin Runners", feature_category: :runner_fleet do
 
     describe "runners creation" do
       before do
-        stub_feature_flags(create_runner_workflow: true)
-
         visit admin_runners_path
       end
 
@@ -35,7 +33,7 @@ RSpec.describe "Admin Runners", feature_category: :runner_fleet do
 
     describe "runners registration" do
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
 
         visit admin_runners_path
       end
diff --git a/spec/frontend/authentication/webauthn/util_spec.js b/spec/frontend/authentication/webauthn/util_spec.js
index bc44b47d0ba..831d1636b8c 100644
--- a/spec/frontend/authentication/webauthn/util_spec.js
+++ b/spec/frontend/authentication/webauthn/util_spec.js
@@ -1,4 +1,9 @@
-import { base64ToBuffer, bufferToBase64, base64ToBase64Url } from '~/authentication/webauthn/util';
+import {
+  base64ToBuffer,
+  bufferToBase64,
+  base64ToBase64Url,
+  supported,
+} from '~/authentication/webauthn/util';
 
 const encodedString = 'SGVsbG8gd29ybGQh';
 const stringBytes = [72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33];
@@ -31,4 +36,28 @@ describe('Webauthn utils', () => {
       expect(base64ToBase64Url(argument)).toBe(expectedResult);
     });
   });
+
+  describe('supported', () => {
+    afterEach(() => {
+      global.navigator.credentials = undefined;
+      window.PublicKeyCredential = undefined;
+    });
+
+    it.each`
+      credentials                    | PublicKeyCredential | expected
+      ${undefined}                   | ${undefined}        | ${false}
+      ${{}}                          | ${undefined}        | ${false}
+      ${{ create: true }}            | ${undefined}        | ${false}
+      ${{ create: true, get: true }} | ${undefined}        | ${false}
+      ${{ create: true, get: true }} | ${true}             | ${true}
+    `(
+      'returns $expected when credentials is $credentials and PublicKeyCredential is $PublicKeyCredential',
+      ({ credentials, PublicKeyCredential, expected }) => {
+        global.navigator.credentials = credentials;
+        window.PublicKeyCredential = PublicKeyCredential;
+
+        expect(supported()).toBe(expected);
+      },
+    );
+  });
 });
diff --git a/spec/frontend/ci/runner/components/runner_list_empty_state_spec.js b/spec/frontend/ci/runner/components/runner_list_empty_state_spec.js
index 9dd6577a166..3e813723b5b 100644
--- a/spec/frontend/ci/runner/components/runner_list_empty_state_spec.js
+++ b/spec/frontend/ci/runner/components/runner_list_empty_state_spec.js
@@ -62,11 +62,11 @@ describe('RunnerListEmptyState', () => {
         expect(findEmptyState().text()).toMatchInterpolatedText(`${title} ${desc}`);
       });
 
-      describe('when create_runner_workflow is enabled', () => {
+      describe('when create_runner_workflow_for_admin is enabled', () => {
         beforeEach(() => {
           createComponent({
             provide: {
-              glFeatures: { createRunnerWorkflow: true },
+              glFeatures: { createRunnerWorkflowForAdmin: true },
             },
           });
         });
@@ -76,14 +76,14 @@ describe('RunnerListEmptyState', () => {
         });
       });
 
-      describe('when create_runner_workflow is enabled and newRunnerPath not defined', () => {
+      describe('when create_runner_workflow_for_admin is enabled and newRunnerPath not defined', () => {
         beforeEach(() => {
           createComponent({
             props: {
               newRunnerPath: null,
             },
             provide: {
-              glFeatures: { createRunnerWorkflow: true },
+              glFeatures: { createRunnerWorkflowForAdmin: true },
             },
           });
         });
@@ -95,11 +95,11 @@ describe('RunnerListEmptyState', () => {
         });
       });
 
-      describe('when create_runner_workflow is disabled', () => {
+      describe('when create_runner_workflow_for_admin is disabled', () => {
         beforeEach(() => {
           createComponent({
             provide: {
-              glFeatures: { createRunnerWorkflow: false },
+              glFeatures: { createRunnerWorkflowForAdmin: false },
             },
           });
         });
diff --git a/spec/lib/gitlab/loggable_spec.rb b/spec/lib/gitlab/loggable_spec.rb
new file mode 100644
index 00000000000..8238e47014b
--- /dev/null
+++ b/spec/lib/gitlab/loggable_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Loggable, feature_category: :logging do
+  subject(:klass_instance) do
+    Class.new do
+      include Gitlab::Loggable
+
+      def self.name
+        'MyTestClass'
+      end
+    end.new
+  end
+
+  describe '#build_structured_payload' do
+    it 'adds class and returns formatted json' do
+      expected = {
+        'class' => 'MyTestClass',
+        'message' => 'test'
+      }
+
+      expect(klass_instance.build_structured_payload(message: 'test')).to eq(expected)
+    end
+
+    it 'appends additional params and returns formatted json' do
+      expected = {
+        'class' => 'MyTestClass',
+        'message' => 'test',
+        'extra_param' => 1
+      }
+
+      expect(klass_instance.build_structured_payload(message: 'test', extra_param: 1)).to eq(expected)
+    end
+
+    it 'does not raise an error in loggers when passed non-symbols' do
+      expected = {
+        'class' => 'MyTestClass',
+        'message' => 'test',
+        '["hello", "thing"]' => :world
+      }
+
+      payload = klass_instance.build_structured_payload(message: 'test', %w[hello thing] => :world)
+      expect(payload).to eq(expected)
+      expect { Gitlab::Export::Logger.info(payload) }.not_to raise_error
+    end
+
+    it 'handles anonymous classes' do
+      anonymous_klass_instance = Class.new { include Gitlab::Loggable }.new
+
+      expected = {
+        'class' => '<Anonymous>',
+        'message' => 'test'
+      }
+
+      expect(anonymous_klass_instance.build_structured_payload(message: 'test')).to eq(expected)
+    end
+
+    it 'handles duplicate keys' do
+      expected = {
+        'class' => 'MyTestClass',
+        'message' => 'test2'
+      }
+
+      expect(klass_instance.build_structured_payload(message: 'test', 'message' => 'test2')).to eq(expected)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter_spec.rb
index d6eb67e5c35..9cbac835a6f 100644
--- a/spec/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/gitlab_cli_activity_unique_counter_spec.rb
@@ -7,9 +7,18 @@ RSpec.describe Gitlab::UsageDataCounters::GitLabCliActivityUniqueCounter, :clean
   let(:user2) { build(:user, id: 2) }
   let(:time) { Time.current }
   let(:action) { described_class::GITLAB_CLI_API_REQUEST_ACTION }
-  let(:user_agent) { { user_agent: 'GLab - GitLab CLI' } }
 
   context 'when tracking a gitlab cli request' do
-    it_behaves_like 'a request from an extension'
+    context 'with the old UserAgent' do
+      let(:user_agent) { { user_agent: 'GLab - GitLab CLI' } }
+
+      it_behaves_like 'a request from an extension'
+    end
+
+    context 'with the current UserAgent' do
+      let(:user_agent) { { user_agent: 'glab/v1.25.3-27-g7ec258fb (built 2023-02-16), darwin' } }
+
+      it_behaves_like 'a request from an extension'
+    end
   end
 end
diff --git a/spec/models/container_repository_spec.rb b/spec/models/container_repository_spec.rb
index ef9ff145cfa..cb235aa5855 100644
--- a/spec/models/container_repository_spec.rb
+++ b/spec/models/container_repository_spec.rb
@@ -531,6 +531,10 @@ RSpec.describe ContainerRepository, :aggregate_failures, feature_category: :cont
   describe '#each_tags_page' do
     let(:page_size) { 100 }
 
+    before do
+      allow(repository).to receive(:migrated?).and_return(true)
+    end
+
     shared_examples 'iterating through a page' do |expected_tags: true|
       it 'iterates through one page' do
         expect(repository.gitlab_api_client).to receive(:tags)
@@ -663,7 +667,7 @@ RSpec.describe ContainerRepository, :aggregate_failures, feature_category: :cont
 
     context 'calling on a non migrated repository' do
       before do
-        repository.update!(created_at: described_class::MIGRATION_PHASE_1_ENDED_AT - 3.days)
+        allow(repository).to receive(:migrated?).and_return(false)
       end
 
       it 'raises an Argument error' do
@@ -1564,22 +1568,20 @@ RSpec.describe ContainerRepository, :aggregate_failures, feature_category: :cont
   describe '#migrated?' do
     subject { repository.migrated? }
 
-    it { is_expected.to eq(true) }
-
-    context 'with a created_at older than phase 1 ends' do
+    context 'on gitlab.com' do
       before do
-        repository.update!(created_at: described_class::MIGRATION_PHASE_1_ENDED_AT - 3.days)
+        allow(::Gitlab).to receive(:com?).and_return(true)
       end
 
-      it { is_expected.to eq(false) }
-
-      context 'with migration state set to import_done' do
-        before do
-          repository.update!(migration_state: 'import_done')
-        end
+      it { is_expected.to eq(true) }
+    end
 
-        it { is_expected.to eq(true) }
+    context 'not on gitlab.com' do
+      before do
+        allow(::Gitlab).to receive(:com?).and_return(false)
       end
+
+      it { is_expected.to eq(false) }
     end
   end
 
diff --git a/spec/policies/global_policy_spec.rb b/spec/policies/global_policy_spec.rb
index 78bbff57572..4ecc7e9ac5e 100644
--- a/spec/policies/global_policy_spec.rb
+++ b/spec/policies/global_policy_spec.rb
@@ -624,57 +624,51 @@ RSpec.describe GlobalPolicy, feature_category: :shared do
   end
 
   describe 'create_instance_runners' do
-    context 'create_runner_workflow flag enabled' do
-      before do
-        stub_feature_flags(create_runner_workflow: true)
-      end
-
-      context 'admin' do
-        let(:current_user) { admin_user }
-
-        context 'when admin mode is enabled', :enable_admin_mode do
-          it { is_expected.to be_allowed(:create_instance_runners) }
-        end
+    context 'admin' do
+      let(:current_user) { admin_user }
 
-        context 'when admin mode is disabled' do
-          it { is_expected.to be_disallowed(:create_instance_runners) }
-        end
+      context 'when admin mode is enabled', :enable_admin_mode do
+        it { is_expected.to be_allowed(:create_instance_runners) }
       end
 
-      context 'with project_bot' do
-        let(:current_user) { project_bot }
-
+      context 'when admin mode is disabled' do
         it { is_expected.to be_disallowed(:create_instance_runners) }
       end
+    end
 
-      context 'with migration_bot' do
-        let(:current_user) { migration_bot }
+    context 'with project_bot' do
+      let(:current_user) { project_bot }
 
-        it { is_expected.to be_disallowed(:create_instance_runners) }
-      end
+      it { is_expected.to be_disallowed(:create_instance_runners) }
+    end
 
-      context 'with security_bot' do
-        let(:current_user) { security_bot }
+    context 'with migration_bot' do
+      let(:current_user) { migration_bot }
 
-        it { is_expected.to be_disallowed(:create_instance_runners) }
-      end
+      it { is_expected.to be_disallowed(:create_instance_runners) }
+    end
 
-      context 'with regular user' do
-        let(:current_user) { user }
+    context 'with security_bot' do
+      let(:current_user) { security_bot }
 
-        it { is_expected.to be_disallowed(:create_instance_runners) }
-      end
+      it { is_expected.to be_disallowed(:create_instance_runners) }
+    end
 
-      context 'with anonymous' do
-        let(:current_user) { nil }
+    context 'with regular user' do
+      let(:current_user) { user }
 
-        it { is_expected.to be_disallowed(:create_instance_runners) }
-      end
+      it { is_expected.to be_disallowed(:create_instance_runners) }
+    end
+
+    context 'with anonymous' do
+      let(:current_user) { nil }
+
+      it { is_expected.to be_disallowed(:create_instance_runners) }
     end
 
-    context 'create_runner_workflow flag disabled' do
+    context 'create_runner_workflow_for_admin flag disabled' do
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
       end
 
       context 'admin' do
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 61b7beb7e54..65a407b0346 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -1297,9 +1297,9 @@ RSpec.describe GroupPolicy, feature_category: :system_access do
       end
     end
 
-    context 'create_runner_workflow flag enabled' do
+    context 'create_runner_workflow_for_admin flag enabled' do
       before do
-        stub_feature_flags(create_runner_workflow: true)
+        stub_feature_flags(create_runner_workflow_for_admin: true)
       end
 
       context 'admin' do
@@ -1380,9 +1380,9 @@ RSpec.describe GroupPolicy, feature_category: :system_access do
       end
     end
 
-    context 'with create_runner_workflow flag disabled' do
+    context 'with create_runner_workflow_for_admin flag disabled' do
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
       end
 
       context 'admin' do
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index bf845d04e27..bc58171f27b 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -2740,9 +2740,9 @@ RSpec.describe ProjectPolicy, feature_category: :system_access do
   end
 
   describe 'create_project_runners' do
-    context 'create_runner_workflow flag enabled' do
+    context 'create_runner_workflow_for_admin flag enabled' do
       before do
-        stub_feature_flags(create_runner_workflow: true)
+        stub_feature_flags(create_runner_workflow_for_admin: true)
       end
 
       context 'admin' do
@@ -2810,9 +2810,9 @@ RSpec.describe ProjectPolicy, feature_category: :system_access do
       end
     end
 
-    context 'create_runner_workflow flag disabled' do
+    context 'create_runner_workflow_for_admin flag disabled' do
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
       end
 
       context 'admin' do
diff --git a/spec/requests/api/graphql/mutations/ci/job_artifact/bulk_destroy_spec.rb b/spec/requests/api/graphql/mutations/ci/job_artifact/bulk_destroy_spec.rb
new file mode 100644
index 00000000000..4e25669a0ca
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/ci/job_artifact/bulk_destroy_spec.rb
@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'BulkDestroy', feature_category: :build_artifacts do
+  include GraphqlHelpers
+
+  let(:maintainer) { create(:user) }
+  let(:developer) { create(:user) }
+  let(:first_artifact) { create(:ci_job_artifact) }
+  let(:second_artifact) { create(:ci_job_artifact, project: project) }
+  let(:second_artifact_another_project) { create(:ci_job_artifact) }
+  let(:project) { first_artifact.job.project }
+  let(:ids) { [first_artifact.to_global_id.to_s] }
+  let(:not_authorized_project_error_message) do
+    "The resource that you are attempting to access " \
+      "does not exist or you don't have permission to perform this action"
+  end
+
+  let(:mutation) do
+    variables = {
+      project_id: project.to_global_id.to_s,
+      ids: ids
+    }
+    graphql_mutation(:bulk_destroy_job_artifacts, variables, <<~FIELDS)
+      destroyedCount
+      destroyedIds
+      errors
+    FIELDS
+  end
+
+  let(:mutation_response) { graphql_mutation_response(:bulk_destroy_job_artifacts) }
+
+  it 'fails to destroy the artifact if a user not in a project' do
+    post_graphql_mutation(mutation, current_user: maintainer)
+
+    expect(graphql_errors).to include(
+      a_hash_including('message' => not_authorized_project_error_message)
+    )
+
+    expect(first_artifact.reload).to be_persisted
+  end
+
+  context 'when the `ci_job_artifact_bulk_destroy` feature flag is disabled' do
+    before do
+      stub_feature_flags(ci_job_artifact_bulk_destroy: false)
+      project.add_maintainer(maintainer)
+    end
+
+    it 'returns a resource not available error' do
+      post_graphql_mutation(mutation, current_user: maintainer)
+
+      expect(graphql_errors).to contain_exactly(
+        hash_including(
+          'message' => '`ci_job_artifact_bulk_destroy` feature flag is disabled.'
+        )
+      )
+    end
+  end
+
+  context "when the user is a developer in a project" do
+    before do
+      project.add_developer(developer)
+    end
+
+    it 'fails to destroy the artifact' do
+      post_graphql_mutation(mutation, current_user: developer)
+
+      expect(graphql_errors).to include(
+        a_hash_including('message' => not_authorized_project_error_message)
+      )
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(first_artifact.reload).to be_persisted
+    end
+  end
+
+  context "when the user is a maintainer in a project" do
+    before do
+      project.add_maintainer(maintainer)
+    end
+
+    shared_examples 'failing mutation' do
+      it 'rejects the request' do
+        post_graphql_mutation(mutation, current_user: maintainer)
+
+        expect(graphql_errors(mutation_response)).to include(expected_error_message)
+
+        expected_not_found_artifacts.each do |artifact|
+          expect { artifact.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        expected_found_artifacts.each do |artifact|
+          expect(artifact.reload).to be_persisted
+        end
+      end
+    end
+
+    it 'destroys the artifact' do
+      post_graphql_mutation(mutation, current_user: maintainer)
+
+      expect(mutation_response).to include("destroyedCount" => 1, "destroyedIds" => [gid_string(first_artifact)])
+      expect(response).to have_gitlab_http_status(:success)
+      expect { first_artifact.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    context "and one artifact doesn't belong to the project" do
+      let(:not_owned_artifact) { create(:ci_job_artifact) }
+      let(:ids) { [first_artifact.to_global_id.to_s, not_owned_artifact.to_global_id.to_s] }
+      let(:expected_error_message) { "Not all artifacts belong to requested project" }
+      let(:expected_not_found_artifacts) { [] }
+      let(:expected_found_artifacts) { [first_artifact, not_owned_artifact] }
+
+      it_behaves_like 'failing mutation'
+    end
+
+    context "and multiple artifacts belong to the maintainer's project" do
+      let(:ids) { [first_artifact.to_global_id.to_s, second_artifact.to_global_id.to_s] }
+
+      it 'destroys all artifacts' do
+        post_graphql_mutation(mutation, current_user: maintainer)
+
+        expect(mutation_response).to include(
+          "destroyedCount" => 2,
+          "destroyedIds" => [gid_string(first_artifact), gid_string(second_artifact)]
+        )
+
+        expect(response).to have_gitlab_http_status(:success)
+        expect { first_artifact.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect { second_artifact.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "and one artifact belongs to a different maintainer's project" do
+      let(:ids) { [first_artifact.to_global_id.to_s, second_artifact_another_project.to_global_id.to_s] }
+      let(:expected_found_artifacts) { [first_artifact, second_artifact_another_project] }
+      let(:expected_not_found_artifacts) { [] }
+      let(:expected_error_message) { "Not all artifacts belong to requested project" }
+
+      it_behaves_like 'failing mutation'
+    end
+
+    context "and not found" do
+      let(:ids) { [first_artifact.to_global_id.to_s, second_artifact.to_global_id.to_s] }
+      let(:not_found_ids) { expected_not_found_artifacts.map(&:id).join(',') }
+      let(:expected_error_message) { "Artifacts (#{not_found_ids}) not found" }
+
+      before do
+        expected_not_found_artifacts.each(&:destroy!)
+      end
+
+      context "with one artifact" do
+        let(:expected_not_found_artifacts) { [second_artifact] }
+        let(:expected_found_artifacts) { [first_artifact] }
+
+        it_behaves_like 'failing mutation'
+      end
+
+      context "with all artifact" do
+        let(:expected_not_found_artifacts) { [first_artifact, second_artifact] }
+        let(:expected_found_artifacts) { [] }
+
+        it_behaves_like 'failing mutation'
+      end
+    end
+
+    context 'when empty request' do
+      before do
+        project.add_maintainer(maintainer)
+      end
+
+      context 'with nil value' do
+        let(:ids) { nil }
+
+        it 'does nothing and returns empty answer' do
+          post_graphql_mutation(mutation, current_user: maintainer)
+
+          expect_graphql_errors_to_include(/was provided invalid value for ids \(Expected value to not be null\)/)
+        end
+      end
+
+      context 'with empty array' do
+        let(:ids) { [] }
+
+        it 'raises argument error' do
+          post_graphql_mutation(mutation, current_user: maintainer)
+
+          expect_graphql_errors_to_include(/IDs array of job artifacts can not be empty/)
+        end
+      end
+    end
+
+    def gid_string(object)
+      Gitlab::GlobalId.build(object, id: object.id).to_s
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb b/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb
index bd22cc6706a..f39f6f84c99 100644
--- a/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb
@@ -62,9 +62,9 @@ RSpec.describe 'RunnerCreate', feature_category: :runner_fleet do
   context 'when user has permissions', :enable_admin_mode do
     let(:current_user) { admin }
 
-    context 'when :create_runner_workflow feature flag is disabled' do
+    context 'when :create_runner_workflow_for_admin feature flag is disabled' do
       before do
-        stub_feature_flags(create_runner_workflow: false)
+        stub_feature_flags(create_runner_workflow_for_admin: false)
       end
 
       it 'returns an error' do
@@ -72,7 +72,7 @@ RSpec.describe 'RunnerCreate', feature_category: :runner_fleet do
 
         expect(graphql_errors).not_to be_empty
         expect(graphql_errors[0]['message'])
-          .to eq("`create_runner_workflow` feature flag is disabled.")
+          .to eq("`create_runner_workflow_for_admin` feature flag is disabled.")
       end
     end
 
diff --git a/spec/services/ci/job_artifacts/bulk_delete_by_project_service_spec.rb b/spec/services/ci/job_artifacts/bulk_delete_by_project_service_spec.rb
new file mode 100644
index 00000000000..a180837f9a9
--- /dev/null
+++ b/spec/services/ci/job_artifacts/bulk_delete_by_project_service_spec.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ::Ci::JobArtifacts::BulkDeleteByProjectService, "#execute", feature_category: :build_artifacts do
+  subject(:execute) do
+    described_class.new(
+      job_artifact_ids: job_artifact_ids,
+      current_user: current_user,
+      project: project).execute
+  end
+
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:build, reload: true) do
+    create(:ci_build, :artifacts, :trace_artifact, user: current_user)
+  end
+
+  let_it_be(:project) { build.project }
+  let_it_be(:job_artifact_ids) { build.job_artifacts.map(&:id) }
+
+  describe '#execute' do
+    context 'when number of artifacts exceeds limits to delete' do
+      let_it_be(:second_build, reload: true) do
+        create(:ci_build, :artifacts, :trace_artifact, user: current_user, project: project)
+      end
+
+      let_it_be(:job_artifact_ids) { ::Ci::JobArtifact.all.map(&:id) }
+
+      before do
+        project.add_maintainer(current_user)
+        stub_const("#{described_class}::JOB_ARTIFACTS_COUNT_LIMIT", 1)
+      end
+
+      it 'fails to destroy' do
+        result = execute
+
+        expect(result).to be_error
+        expect(result[:message]).to eq('Can only delete up to 1 job artifacts per call')
+      end
+    end
+
+    context 'when requested not existing artifacts do delete' do
+      let_it_be(:deleted_build, reload: true) do
+        create(:ci_build, :artifacts, :trace_artifact, user: current_user, project: project)
+      end
+
+      let_it_be(:deleted_job_artifacts) { deleted_build.job_artifacts }
+      let_it_be(:job_artifact_ids) { ::Ci::JobArtifact.all.map(&:id) }
+
+      before do
+        project.add_maintainer(current_user)
+        deleted_job_artifacts.each(&:destroy!)
+      end
+
+      it 'fails to destroy' do
+        result = execute
+
+        expect(result).to be_error
+        expect(result[:message]).to eq("Artifacts (#{deleted_job_artifacts.map(&:id).join(',')}) not found")
+      end
+    end
+
+    context 'when maintainer has access to the project' do
+      before do
+        project.add_maintainer(current_user)
+      end
+
+      it 'is successful' do
+        result = execute
+
+        expect(result).to be_success
+        expect(result.payload).to eq(
+          {
+            destroyed_count: job_artifact_ids.count,
+            destroyed_ids: job_artifact_ids,
+            errors: []
+          }
+        )
+        expect(::Ci::JobArtifact.where(id: job_artifact_ids).count).to eq(0)
+      end
+
+      context 'and partially owns artifacts' do
+        let_it_be(:orphan_artifact) { create(:ci_job_artifact, :archive) }
+        let_it_be(:orphan_artifact_id) { orphan_artifact.id }
+        let_it_be(:owned_artifacts_ids) { build.job_artifacts.erasable.map(&:id) }
+        let_it_be(:job_artifact_ids) { [orphan_artifact_id] + owned_artifacts_ids }
+
+        it 'fails to destroy' do
+          result = execute
+
+          expect(result).to be_error
+          expect(result[:message]).to be('Not all artifacts belong to requested project')
+          expect(::Ci::JobArtifact.where(id: job_artifact_ids).count).to eq(3)
+        end
+      end
+
+      context 'and request all artifacts from a different project' do
+        let_it_be(:different_project_artifact) { create(:ci_job_artifact, :archive) }
+        let_it_be(:job_artifact_ids) { [different_project_artifact] }
+
+        let_it_be(:different_build, reload: true) do
+          create(:ci_build, :artifacts, :trace_artifact, user: current_user)
+        end
+
+        let_it_be(:different_project) { different_build.project }
+
+        before do
+          different_project.add_maintainer(current_user)
+        end
+
+        it 'returns a error' do
+          result = execute
+
+          expect(result).to be_error
+          expect(result[:message]).to be('Not all artifacts belong to requested project')
+          expect(::Ci::JobArtifact.where(id: job_artifact_ids).count).to eq(job_artifact_ids.count)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb b/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb
index fd8378e9f0f..ed3e3e6766f 100644
--- a/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb
+++ b/spec/services/ci/job_artifacts/destroy_batch_service_spec.rb
@@ -32,6 +32,27 @@ RSpec.describe Ci::JobArtifacts::DestroyBatchService, feature_category: :build_a
   describe '#execute' do
     subject(:execute) { service.execute }
 
+    context 'with skip_trace_artifacts false' do
+      let(:service) do
+        described_class.new(
+          artifacts,
+          pick_up_at: Time.current,
+          skip_projects_on_refresh: skip_projects_on_refresh,
+          skip_trace_artifacts: false
+        )
+      end
+
+      subject(:execute) { service.execute }
+
+      it 'deletes trace artifacts' do
+        expect { subject }
+                .to change { Ci::JobArtifact.exists?(trace_artifact.id) }.from(true).to(false)
+
+        expected_destroyed_ids = [artifact_with_file.id, artifact_without_file.id, trace_artifact.id]
+        is_expected.to include(destroyed_artifacts_count: 3, destroyed_ids: expected_destroyed_ids)
+      end
+    end
+
     it 'creates a deleted object for artifact with attached file' do
       expect { subject }.to change { Ci::DeletedObject.count }.by(1)
     end
@@ -287,7 +308,7 @@ RSpec.describe Ci::JobArtifacts::DestroyBatchService, feature_category: :build_a
       end
 
       it 'reports the number of destroyed artifacts' do
-        is_expected.to eq(destroyed_artifacts_count: 0, statistics_updates: {}, status: :success)
+        is_expected.to eq(destroyed_artifacts_count: 0, destroyed_ids: [], statistics_updates: {}, status: :success)
       end
     end
   end
diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
index 8311c4e4d9b..0e4bb69f633 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -77,7 +77,7 @@ RSpec.describe Projects::ContainerRepository::CleanupTagsService do
 
       context 'with a migrated repository' do
         before do
-          container_repository.update_column(:migration_state, :import_done)
+          allow(container_repository).to receive(:migrated?).and_return(true)
         end
 
         context 'supporting the gitlab api' do
@@ -99,8 +99,7 @@ RSpec.describe Projects::ContainerRepository::CleanupTagsService do
 
       context 'with a non migrated repository' do
         before do
-          container_repository.update_column(:migration_state, :default)
-          container_repository.update!(created_at: ContainerRepository::MIGRATION_PHASE_1_ENDED_AT - 1.week)
+          allow(container_repository).to receive(:migrated?).and_return(false)
         end
 
         it_behaves_like 'calling service', ::Projects::ContainerRepository::ThirdParty::CleanupTagsService, extra_log_data: { third_party_cleanup_tags_service: true }
diff --git a/spec/services/projects/container_repository/gitlab/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/gitlab/cleanup_tags_service_spec.rb
index b06a5709bd5..653d8d90c76 100644
--- a/spec/services/projects/container_repository/gitlab/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/gitlab/cleanup_tags_service_spec.rb
@@ -11,11 +11,13 @@ RSpec.describe Projects::ContainerRepository::Gitlab::CleanupTagsService do
   let_it_be(:user) { create(:user) }
   let_it_be(:project, reload: true) { create(:project, :private) }
 
-  let(:repository) { create(:container_repository, :root, :import_done, project: project) }
+  let(:repository) { create(:container_repository, :root, project: project) }
   let(:service) { described_class.new(container_repository: repository, current_user: user, params: params) }
   let(:tags) { %w[latest A Ba Bb C D E] }
 
   before do
+    allow(repository).to receive(:migrated?).and_return(true)
+
     project.add_maintainer(user) if user
 
     stub_container_registry_config(enabled: true)
diff --git a/yarn.lock b/yarn.lock
index 80d9713aa2f..45ddeebeceb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1294,10 +1294,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e"
   integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg==
 
-"@gitlab/eslint-plugin@18.1.0":
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-18.1.0.tgz#8300cc938f50114b3e74d97660721486c13caea5"
-  integrity sha512-O803ResZfPpbSk8USzYwT79OXKSyuR4z4qbjOae/NIhzobxrlEHm4LbauVuaFpHurF5gYceNtHltczwK8e+mOg==
+"@gitlab/eslint-plugin@18.2.0":
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-18.2.0.tgz#82810648a2273acfa5fd04fec9bf5dfa0f736c63"
+  integrity sha512-ynj2KyRkNykvZKqNDYInh5hZZRYxzZdOB6VUFOAjxW/nu2LDXquepqa+BDF956LDAhWMG0BGFqhqa8GRjxdi2w==
   dependencies:
     "@babel/core" "^7.17.0"
     "@babel/eslint-parser" "^7.17.0"