Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

230 files changed, 1576 insertions, 467 deletions

diff --git a/config/application.rb b/config/application.rb
index c6ecfcc0cb1..781b6e042b1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,7 +32,6 @@ module Gitlab
     # Rails 6.1
     config.action_dispatch.cookies_same_site_protection = nil # New default is :lax
     ActiveSupport.utc_to_local_returns_utc_offset_times = false
-    config.action_controller.urlsafe_csrf_tokens = false
     config.action_view.preload_links_header = false
 
     # Rails 5.2
@@ -258,7 +257,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
     config.assets.precompile << "page_bundles/admin/application_settings_metrics_and_profiling.css"
     config.assets.precompile << "page_bundles/admin/elasticsearch_form.css"
-    config.assets.precompile << "page_bundles/admin/geo_nodes.css"
+    config.assets.precompile << "page_bundles/admin/geo_sites.css"
     config.assets.precompile << "page_bundles/admin/geo_replicable.css"
     config.assets.precompile << "page_bundles/admin/jobs_index.css"
     config.assets.precompile << "page_bundles/alert_management_details.css"
@@ -268,6 +267,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/branches.css"
     config.assets.precompile << "page_bundles/build.css"
     config.assets.precompile << "page_bundles/ci_status.css"
+    config.assets.precompile << "page_bundles/ci_cd_settings.css"
     config.assets.precompile << "page_bundles/cluster_agents.css"
     config.assets.precompile << "page_bundles/clusters.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
@@ -300,6 +300,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/merge_request_analytics.css"
     config.assets.precompile << "page_bundles/merge_requests.css"
     config.assets.precompile << "page_bundles/milestone.css"
+    config.assets.precompile << "page_bundles/ml_experiment_tracking.css"
     config.assets.precompile << "page_bundles/new_namespace.css"
     config.assets.precompile << "page_bundles/notifications.css"
     config.assets.precompile << "page_bundles/oncall_schedules.css"
@@ -403,7 +404,7 @@ module Gitlab
 
     config.middleware.insert_before ActionDispatch::RemoteIp, ::Gitlab::Middleware::HandleIpSpoofAttackError
 
-    config.middleware.insert_after ActionDispatch::ActionableExceptions, ::Gitlab::Middleware::HandleMalformedStrings
+    config.middleware.insert_after Rails::Rack::Logger, ::Gitlab::Middleware::HandleMalformedStrings
 
     config.middleware.insert_after Rack::Sendfile, ::Gitlab::Middleware::RackMultipartTempfileFactory
 
diff --git a/config/audit_events/types/feature_flag_created.yml b/config/audit_events/types/feature_flag_created.yml
new file mode 100644
index 00000000000..053580879fd
--- /dev/null
+++ b/config/audit_events/types/feature_flag_created.yml
@@ -0,0 +1,9 @@
+---
+name: feature_flag_created
+description: Triggered when a feature flag is created.
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/374109
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113453
+feature_category: feature_flags
+milestone: '15.10'
+saved_to_database: true
+streamed: true
diff --git a/config/audit_events/types/feature_flag_deleted.yml b/config/audit_events/types/feature_flag_deleted.yml
new file mode 100644
index 00000000000..3de626409d5
--- /dev/null
+++ b/config/audit_events/types/feature_flag_deleted.yml
@@ -0,0 +1,9 @@
+---
+name: feature_flag_deleted
+description: Triggered when a feature flag is deleted.
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/374109
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113453
+feature_category: feature_flags
+milestone: '15.10'
+saved_to_database: true
+streamed: true
diff --git a/config/audit_events/types/feature_flag_updated.yml b/config/audit_events/types/feature_flag_updated.yml
new file mode 100644
index 00000000000..0314684cb48
--- /dev/null
+++ b/config/audit_events/types/feature_flag_updated.yml
@@ -0,0 +1,9 @@
+---
+name: feature_flag_updated
+description: Triggered when a feature flag is updated.
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/374109
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113453
+feature_category: feature_flags
+milestone: '15.10'
+saved_to_database: true
+streamed: true
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6b44af3b658..3823b76d0f2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -47,6 +47,7 @@ Rails.application.configure do
   config.lookbook.page_paths = ["#{config.root}/spec/components/docs"]
   config.lookbook.preview_params_options_eval = true
   config.lookbook.preview_display_options = {
+    layout: %w[fixed fluid],
     theme: ["light", "dark (alpha)"]
   }
 
@@ -74,6 +75,8 @@ Rails.application.configure do
 
   # BetterErrors live shell (REPL) on every stack frame
   BetterErrors::Middleware.allow_ip!("127.0.0.1/0")
+  # Disable REPL due to security concerns.
+  BetterErrors.binding_of_caller_available = false
 
   # Reassign some performance related settings when we profile the app
   if Gitlab::Utils.to_boolean(ENV['RAILS_PROFILE'].to_s)
diff --git a/config/esbuild.config.js b/config/esbuild.config.js
index e876436e864..b17548d8300 100644
--- a/config/esbuild.config.js
+++ b/config/esbuild.config.js
@@ -56,4 +56,10 @@ module.exports = {
     'class-field': false,
   },
   implementation: esbuild,
+  /**
+   * It's necessary to tell esbuild to use the 'js' loader
+   * because esbuild cannot auto-detect which loader to use
+   * based on the .vue extension.
+   */
+  loader: 'js',
 };
diff --git a/config/events/1655841083_projects_settings_cicd_show_render.yml b/config/events/1655841083_projects_settings_cicd_show_render.yml
index 45f0037443b..81612662a0d 100644
--- a/config/events/1655841083_projects_settings_cicd_show_render.yml
+++ b/config/events/1655841083_projects_settings_cicd_show_render.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
 distributions:
   - ce
   - ee
-tiers: 
+tiers:
   - free
   - premium
   - ultimate
diff --git a/config/events/1655841352_projects_settings_cicd_show_upload.yml b/config/events/1655841352_projects_settings_cicd_show_upload.yml
index a19462d671e..12dd9fd8850 100644
--- a/config/events/1655841352_projects_settings_cicd_show_upload.yml
+++ b/config/events/1655841352_projects_settings_cicd_show_upload.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
 distributions:
   - ce
   - ee
-tiers: 
+tiers:
   - free
   - premium
   - ultimate
diff --git a/config/events/1655841364_projects_settings_cicd_show_delete.yml b/config/events/1655841364_projects_settings_cicd_show_delete.yml
index c106ab376e3..f4504d5df63 100644
--- a/config/events/1655841364_projects_settings_cicd_show_delete.yml
+++ b/config/events/1655841364_projects_settings_cicd_show_delete.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
 distributions:
   - ce
   - ee
-tiers: 
+tiers:
   - free
   - premium
   - ultimate
diff --git a/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml b/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
index d19db52074b..4fc127ebfb1 100644
--- a/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
+++ b/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
@@ -16,7 +16,7 @@ identifiers:
 product_section: dev
 product_stage: manage
 product_group: group::authentication and authorization
-product_category: authentication_and_authorization
+product_category: system_access
 milestone: "15.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100237
 distributions:
diff --git a/config/events/1674843937_Ci__Build_create_id_tokens.yml b/config/events/1674843937_Ci__Build_create_id_tokens.yml
index a6cc03c2bad..ca9f9c04213 100644
--- a/config/events/1674843937_Ci__Build_create_id_tokens.yml
+++ b/config/events/1674843937_Ci__Build_create_id_tokens.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110422
 distributions:
 - ce
 - ee
-tiers: 
+tiers:
 - free
 - premium
 - ultimate
diff --git a/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
new file mode 100644
index 00000000000..28c80a4cbc7
--- /dev/null
+++ b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `i_compliance_audit_events` Redis HLL metric as a Snowplow event. Emitted when audit logs page is visited in Admin area.
+category: Admin::AuditLogsController
+action: visit_instance_compliance_audit_events
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+#- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
new file mode 100644
index 00000000000..ce1000556a7
--- /dev/null
+++ b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `i_compliance_credential_inventory` Redis HLL metric as a Snowplow event. Emitted when credentials page is visited in Admin area.
+category: Admin::CredentialsController
+action: visit_compliance_credential_inventory
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+#- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
new file mode 100644
index 00000000000..c2b8dd03ac2
--- /dev/null
+++ b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `g_compliance_audit_events` Redis HLL metric as a Snowplow event. Emitted when group audit events page is visited.
+category: Groups::AuditEventsController
+action: visit_group_compliance_audit_events
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers: 
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
new file mode 100644
index 00000000000..4a0db5f83a8
--- /dev/null
+++ b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `a_compliance_audit_events_api` Redis HLL metric as a Snowplow event. Emitted when Instance Audit Events REST API endpoint is called.
+category: API::AuditEvents
+action: admin_audit_event_request
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+#- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers: 
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
new file mode 100644
index 00000000000..cbc12d58ed1
--- /dev/null
+++ b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `a_compliance_audit_events_api` Redis HLL metric as a Snowplow event. Emitted when Group Audit Events REST API endpoint is called.
+category: EE::API::Groups
+action: group_audit_event_request
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
new file mode 100644
index 00000000000..8b895871275
--- /dev/null
+++ b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `a_compliance_audit_events_api` Redis HLL metric as a Snowplow event. Emitted when Project Audit Events REST API endpoint is called.
+category: EE::API::Projects
+action: project_audit_event_request
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/202109151015_notes__create_service_execute.yml b/config/events/202109151015_notes__create_service_execute.yml
index 12da6da02f0..5ca57011bb9 100644
--- a/config/events/202109151015_notes__create_service_execute.yml
+++ b/config/events/202109151015_notes__create_service_execute.yml
@@ -8,7 +8,7 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: group::pipeline execution
 product_category:
 milestone: "12.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18890
diff --git a/config/events/20211215022206_default_review_app_open_review_app.yml b/config/events/20211215022206_default_review_app_open_review_app.yml
index c77b904bc01..67e7e9be15d 100644
--- a/config/events/20211215022206_default_review_app_open_review_app.yml
+++ b/config/events/20211215022206_default_review_app_open_review_app.yml
@@ -8,7 +8,7 @@ extra_properties:
 identifiers:
 product_section: ops
 product_stage: verify
-product_group: group::pipeline insights
+product_group: group::pipeline execution
 product_category:
 milestone: "12.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18141
diff --git a/config/events/20230228151130_invite_members_modal_click_cancel.yml b/config/events/20230228151130_invite_members_modal_click_cancel.yml
new file mode 100644
index 00000000000..76ae982fd8b
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_click_cancel.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is canceled
+category: invite_members_modal
+action: click_cancel
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230228151130_invite_members_modal_click_x.yml b/config/events/20230228151130_invite_members_modal_click_x.yml
new file mode 100644
index 00000000000..6b9830add5f
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_click_x.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is dismissed
+category: invite_members_modal
+action: click_x
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230228151130_invite_members_modal_invite_successful.yml b/config/events/20230228151130_invite_members_modal_invite_successful.yml
new file mode 100644
index 00000000000..5f0beed721f
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_invite_successful.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is submitted successfully
+category: invite_members_modal
+action: invite_successful
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230228151130_invite_members_modal_render.yml b/config/events/20230228151130_invite_members_modal_render.yml
new file mode 100644
index 00000000000..5417d64c6e7
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_render.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is opened from top nav
+category: invite_members_modal
+action: render
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 64a4eeaaea3..1a4d6e59f2d 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -15,12 +15,12 @@
 - application_performance
 - attack_emulation
 - audit_events
-- authentication_and_authorization
 - auto_devops
 - backup_restore
 - billing_and_payments
 - build
 - build_artifacts
+- capacity_planning
 - cloud_native_installation
 - cluster_cost_management
 - code_quality
@@ -35,7 +35,6 @@
 - continuous_delivery
 - continuous_integration
 - continuous_verification
-- credential_management
 - customersdot_application
 - database
 - dataops
@@ -67,6 +66,7 @@
 - geo_replication
 - gitaly
 - gitlab_cli
+- gitlab_docs
 - global_search
 - helm_chart_registry
 - importers
@@ -93,9 +93,7 @@
 - onboarding
 - package_registry
 - pages
-- performance_testing
-- permissions
-- pipeline_authoring
+- pipeline_composition
 - planning_analytics
 - pods
 - portfolio_management
diff --git a/config/feature_flags/development/notes_create_service_tracking.yml b/config/feature_flags/development/abuse_reports_list.yml
index 578c1e2a707..21954797720 100644
--- a/config/feature_flags/development/notes_create_service_tracking.yml
+++ b/config/feature_flags/development/abuse_reports_list.yml
@@ -1,8 +1,8 @@
 ---
-name: notes_create_service_tracking
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18890
+name: abuse_reports_list
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110205
 rollout_issue_url:
-milestone: '12.5'
+milestone: '15.10'
 type: development
-group: group::pipeline insights
+group: group::anti-abuse
 default_enabled: false
diff --git a/config/feature_flags/development/achievements.yml b/config/feature_flags/development/achievements.yml
index 853a8133351..ef4842b45bb 100644
--- a/config/feature_flags/development/achievements.yml
+++ b/config/feature_flags/development/achievements.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106909
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386817
 milestone: '15.8'
 type: development
-group: group::organization
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/always_perform_delayed_deletion.yml b/config/feature_flags/development/always_perform_delayed_deletion.yml
new file mode 100644
index 00000000000..6708b5b9f90
--- /dev/null
+++ b/config/feature_flags/development/always_perform_delayed_deletion.yml
@@ -0,0 +1,8 @@
+---
+name: always_perform_delayed_deletion
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113332
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393622
+milestone: '15.10'
+type: development
+group: group::tenant scale
+default_enabled: false
diff --git a/config/feature_flags/development/artifacts_management_page.yml b/config/feature_flags/development/artifacts_management_page.yml
index 94ef885f4b9..078e18a703f 100644
--- a/config/feature_flags/development/artifacts_management_page.yml
+++ b/config/feature_flags/development/artifacts_management_page.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16654
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254938
 milestone: '12.4'
 type: development
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: false
diff --git a/config/feature_flags/development/repack_after_shard_migration.yml b/config/feature_flags/development/blame_page_streaming.yml
index 15b7a3e67b0..44d64800dab 100644
--- a/config/feature_flags/development/repack_after_shard_migration.yml
+++ b/config/feature_flags/development/blame_page_streaming.yml
@@ -1,8 +1,8 @@
 ---
-name: repack_after_shard_migration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21502
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/195597
-milestone: '12.6'
+name: blame_page_streaming
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110208
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392890
+milestone: '15.10'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml b/config/feature_flags/development/ci_batch_project_includes_context.yml
index 42afd4235cc..634ed19bf34 100644
--- a/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml
+++ b/config/feature_flags/development/ci_batch_project_includes_context.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_hooks_pre_get_sources_script
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102332
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381840
-milestone: '15.6'
+name: ci_batch_project_includes_context
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112570
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392746
+milestone: '15.10'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml b/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml
deleted file mode 100644
index eba1c4ead3b..00000000000
--- a/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_destroy_unlocked_job_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72406
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338165
-milestone: '14.5'
-type: development
-group: group::pipeline insights
-default_enabled: true
diff --git a/config/feature_flags/development/improved_spread_parallel_import.yml b/config/feature_flags/development/ci_fix_max_includes.yml
index a1d7caf12b0..b70fb3f1222 100644
--- a/config/feature_flags/development/improved_spread_parallel_import.yml
+++ b/config/feature_flags/development/ci_fix_max_includes.yml
@@ -1,8 +1,8 @@
 ---
-name: improved_spread_parallel_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109264
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388665
-milestone: '15.9'
+name: ci_fix_max_includes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112963
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390909
+milestone: '15.10'
 type: development
-group: group::import
+group: group::pipeline authoring
 default_enabled: true
diff --git a/config/feature_flags/development/ci_inbound_job_token_scope.yml b/config/feature_flags/development/ci_inbound_job_token_scope.yml
deleted file mode 100644
index a0e2e09dde5..00000000000
--- a/config/feature_flags/development/ci_inbound_job_token_scope.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_inbound_job_token_scope
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99165
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376063
-milestone: '15.5'
-type: development
-group: group::pipeline execution
-default_enabled: true
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/ci_includes_count_duplicates.yml b/config/feature_flags/development/ci_private_catalog_beta.yml
index 5e33edddc03..8e4cf3168b1 100644
--- a/config/feature_flags/development/ci_includes_count_duplicates.yml
+++ b/config/feature_flags/development/ci_private_catalog_beta.yml
@@ -1,8 +1,8 @@
----
-name: ci_includes_count_duplicates
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111726
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391517
-milestone: '15.9'
+name: ci_private_catalog_beta
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113407
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/394772
+milestone: '15.10'
 type: development
 group: group::pipeline authoring
 default_enabled: false
+
diff --git a/config/feature_flags/development/ci_variables_pages.yml b/config/feature_flags/development/ci_variables_pages.yml
new file mode 100644
index 00000000000..49fc081ede4
--- /dev/null
+++ b/config/feature_flags/development/ci_variables_pages.yml
@@ -0,0 +1,8 @@
+name: ci_variables_pages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110817
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392874
+milestone: '15.10'
+type: development
+group: group::pipeline security
+default_enabled: false
+
diff --git a/config/feature_flags/development/airflow_dags.yml b/config/feature_flags/development/cloudseed_aws.yml
index e32035e7d2a..eba4bede372 100644
--- a/config/feature_flags/development/airflow_dags.yml
+++ b/config/feature_flags/development/cloudseed_aws.yml
@@ -1,8 +1,8 @@
 ---
-name: airflow_dags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108900
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387529
-milestone: '15.9'
+name: cloudseed_aws
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114245
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395777
+milestone: '15.10'
 type: development
 group: group::incubation
 default_enabled: false
diff --git a/config/feature_flags/development/add_refresh_pull_mirror_worker.yml b/config/feature_flags/development/codeowners_default_owners.yml
index f59f0ff3d8e..df8c24ed689 100644
--- a/config/feature_flags/development/add_refresh_pull_mirror_worker.yml
+++ b/config/feature_flags/development/codeowners_default_owners.yml
@@ -1,8 +1,8 @@
 ---
-name: add_refresh_pull_mirror_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103665
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382226
-milestone: '15.7'
+name: codeowners_default_owners
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113594
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/394811
+milestone: '15.11'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/counter_attribute_db_lease_for_update.yml b/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
index 7c30bb3e913..8a991dd7aea 100644
--- a/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
+++ b/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97912
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374596
 milestone: '15.5'
 type: development
-group: group::pipeline insights
+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/config/feature_flags/development/create_runner_workflow_for_namespace.yml b/config/feature_flags/development/create_runner_workflow_for_namespace.yml
new file mode 100644
index 00000000000..783bb9803a1
--- /dev/null
+++ b/config/feature_flags/development/create_runner_workflow_for_namespace.yml
@@ -0,0 +1,8 @@
+---
+name: create_runner_workflow_for_namespace
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113535
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393919
+milestone: '15.10'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml b/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
deleted file mode 100644
index acf5902716e..00000000000
--- a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: delayed_repository_update_mirror_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89501
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362894
-milestone: '15.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/limited_capacity_seat_refresh_worker_low.yml b/config/feature_flags/development/disable_update_max_seats_worker.yml
index a0b306ac792..ae0fe482ee9 100644
--- a/config/feature_flags/development/limited_capacity_seat_refresh_worker_low.yml
+++ b/config/feature_flags/development/disable_update_max_seats_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: limited_capacity_seat_refresh_worker_low
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104099
+name: disable_update_max_seats_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114127
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382725
-milestone: '15.9'
+milestone: '15.10'
 type: development
 group: group::utilization
 default_enabled: false
diff --git a/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml b/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
index 30790841695..a7e34682278 100644
--- a/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
+++ b/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110986
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390336
 milestone: '15.9'
 type: development
-group: group::organization
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/enable_environments_search_within_folder.yml b/config/feature_flags/development/enable_environments_search_within_folder.yml
index a03b31ffbfc..18edc467293 100644
--- a/config/feature_flags/development/enable_environments_search_within_folder.yml
+++ b/config/feature_flags/development/enable_environments_search_within_folder.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102227/
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382108
 milestone: '15.7'
 type: development
-group: group::release
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml b/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml
deleted file mode 100644
index 25e193aa590..00000000000
--- a/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: enforce_max_attachment_size_upload_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57250
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325787
-milestone: '13.11'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/environment_details_vue.yml b/config/feature_flags/development/environment_details_vue.yml
index 5a647f65a7a..c757329c271 100644
--- a/config/feature_flags/development/environment_details_vue.yml
+++ b/config/feature_flags/development/environment_details_vue.yml
@@ -4,5 +4,5 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105527
 rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/384914"
 milestone: '15.7'
 type: development
-group: group::release
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/environment_search_api_min_chars.yml b/config/feature_flags/development/environment_search_api_min_chars.yml
index 2d719a41cd0..4df65792218 100644
--- a/config/feature_flags/development/environment_search_api_min_chars.yml
+++ b/config/feature_flags/development/environment_search_api_min_chars.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108277
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387244
 milestone: '15.8'
 type: development
-group: group::release
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/environments_search_logging.yml b/config/feature_flags/development/environments_search_logging.yml
deleted file mode 100644
index 76f6c78154b..00000000000
--- a/config/feature_flags/development/environments_search_logging.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: environments_search_logging
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107866
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386778
-milestone: '15.8'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/fe_epic_board_total_weight.yml b/config/feature_flags/development/fe_epic_board_total_weight.yml
index 5550d7fa01d..4fbb7c2daf4 100644
--- a/config/feature_flags/development/fe_epic_board_total_weight.yml
+++ b/config/feature_flags/development/fe_epic_board_total_weight.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364503
 milestone: '15.1'
 type: development
 group: group::product planning
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/file_line_blame.yml b/config/feature_flags/development/file_line_blame.yml
index f763d436041..b0762b18fed 100644
--- a/config/feature_flags/development/file_line_blame.yml
+++ b/config/feature_flags/development/file_line_blame.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370818
 milestone: '15.3'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/full_path_project_search.yml b/config/feature_flags/development/full_path_project_search.yml
index 83c52a20995..19ce8d05502 100644
--- a/config/feature_flags/development/full_path_project_search.yml
+++ b/config/feature_flags/development/full_path_project_search.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388473
 milestone: '15.9'
 type: development
 group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml b/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml
deleted file mode 100644
index 2d045e8ca06..00000000000
--- a/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_client_fetch_repos_via_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105824
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385649
-milestone: '15.7'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/github_import_gists.yml b/config/feature_flags/development/github_import_gists.yml
index 8e6e5825362..a8d1483f26f 100644
--- a/config/feature_flags/development/github_import_gists.yml
+++ b/config/feature_flags/development/github_import_gists.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386579
 milestone: '15.8'
 type: development
 group: group::import
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/apple_app_store_integration.yml b/config/feature_flags/development/google_play_integration.yml
index ec55f1ef932..81c509cdab7 100644
--- a/config/feature_flags/development/apple_app_store_integration.yml
+++ b/config/feature_flags/development/google_play_integration.yml
@@ -1,8 +1,8 @@
 ---
-name: apple_app_store_integration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104888
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385335
-milestone: '15.8'
+name: google_play_integration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110440
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389611
+milestone: '15.10'
 type: development
 group: group::incubation
 default_enabled: false
diff --git a/config/feature_flags/development/hash_oauth_secrets.yml b/config/feature_flags/development/hash_oauth_secrets.yml
deleted file mode 100644
index 4f42dc6883c..00000000000
--- a/config/feature_flags/development/hash_oauth_secrets.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: hash_oauth_secrets
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96252
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374588
-milestone: '15.4'
-type: development
-group: group::authentication and authorization
-default_enabled: true
diff --git a/config/feature_flags/development/hide_public_email_on_profile.yml b/config/feature_flags/development/hide_public_email_on_profile.yml
index acf8e4e9ca7..5bf5a203e49 100644
--- a/config/feature_flags/development/hide_public_email_on_profile.yml
+++ b/config/feature_flags/development/hide_public_email_on_profile.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79717
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351731
 milestone: '14.8'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/incident_event_tags.yml b/config/feature_flags/development/incident_event_tags.yml
index 68101b21569..69a7b67a186 100644
--- a/config/feature_flags/development/incident_event_tags.yml
+++ b/config/feature_flags/development/incident_event_tags.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387647
 milestone: '15.8'
 type: development
 group: group::respond
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml b/config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml
deleted file mode 100644
index d7f2d1f5552..00000000000
--- a/config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: include_memberships_from_group_shares_in_preloader
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111157
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390780
-milestone: '15.9'
-type: development
-group: group::organization
-default_enabled: false
diff --git a/config/feature_flags/development/increase_page_size_exponentially.yml b/config/feature_flags/development/increase_page_size_exponentially.yml
deleted file mode 100644
index 8297a4078fa..00000000000
--- a/config/feature_flags/development/increase_page_size_exponentially.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: increase_page_size_exponentially
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66174
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369434
-milestone: '14.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/integration_slack_app_notifications.yml b/config/feature_flags/development/integration_slack_app_notifications.yml
deleted file mode 100644
index 4b9903b25c9..00000000000
--- a/config/feature_flags/development/integration_slack_app_notifications.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: integration_slack_app_notifications
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98663
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381012
-milestone: '15.5'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/invitation_flow_enforcement_setting.yml b/config/feature_flags/development/invitation_flow_enforcement_setting.yml
index 39da6c40bed..d5b5d57c933 100644
--- a/config/feature_flags/development/invitation_flow_enforcement_setting.yml
+++ b/config/feature_flags/development/invitation_flow_enforcement_setting.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92218
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367666
 milestone: '15.4'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/kas_user_access.yml b/config/feature_flags/development/kas_user_access.yml
new file mode 100644
index 00000000000..efcf0c15227
--- /dev/null
+++ b/config/feature_flags/development/kas_user_access.yml
@@ -0,0 +1,8 @@
+---
+name: kas_user_access
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104504'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391201'
+milestone: '15.10'
+type: development
+group: group::configure
+default_enabled: false
diff --git a/config/feature_flags/development/kas_user_access_project.yml b/config/feature_flags/development/kas_user_access_project.yml
new file mode 100644
index 00000000000..34a4ac1271a
--- /dev/null
+++ b/config/feature_flags/development/kas_user_access_project.yml
@@ -0,0 +1,8 @@
+---
+name: kas_user_access_project
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104504'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391211'
+milestone: '15.10'
+type: development
+group: group::configure
+default_enabled: false
diff --git a/config/feature_flags/development/bulk_import_projects.yml b/config/feature_flags/development/large_ipynb_diffs.yml
index 853389577cf..fd1f8f487e6 100644
--- a/config/feature_flags/development/bulk_import_projects.yml
+++ b/config/feature_flags/development/large_ipynb_diffs.yml
@@ -1,8 +1,8 @@
 ---
-name: bulk_import_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68873
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339941
-milestone: '14.3'
+name: large_ipynb_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113370
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393886
+milestone: '15.10'
 type: development
-group: group::import
+group: group::incubation
 default_enabled: false
diff --git a/config/feature_flags/development/deduplicate_archive_traces_cron_worker.yml b/config/feature_flags/development/lazy_load_pipeline_dropdown_actions.yml
index c26968381ae..136cb9a3615 100644
--- a/config/feature_flags/development/deduplicate_archive_traces_cron_worker.yml
+++ b/config/feature_flags/development/lazy_load_pipeline_dropdown_actions.yml
@@ -1,8 +1,8 @@
 ---
-name: deduplicate_archive_traces_cron_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110305
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389632
-milestone: '15.9'
+name: lazy_load_pipeline_dropdown_actions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114490
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393846
+milestone: '15.10'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml b/config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml
deleted file mode 100644
index 1df482e0624..00000000000
--- a/config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: limited_capacity_seat_refresh_worker_medium
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104099
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382725
-milestone: '15.9'
-type: development
-group: group::utilization
-default_enabled: false
diff --git a/config/feature_flags/development/linear_group_descendants_finder_upto.yml b/config/feature_flags/development/linear_group_descendants_finder_upto.yml
index db3a37191ff..f2f4bec57da 100644
--- a/config/feature_flags/development/linear_group_descendants_finder_upto.yml
+++ b/config/feature_flags/development/linear_group_descendants_finder_upto.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78991
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350972
 milestone: '14.8'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/linear_project_ancestors.yml b/config/feature_flags/development/linear_project_ancestors.yml
deleted file mode 100644
index 00b04b20b30..00000000000
--- a/config/feature_flags/development/linear_project_ancestors.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_project_ancestors
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68072
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338403
-milestone: '14.2'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/linear_user_manageable_groups.yml b/config/feature_flags/development/linear_user_manageable_groups.yml
deleted file mode 100644
index 8d59d689f6e..00000000000
--- a/config/feature_flags/development/linear_user_manageable_groups.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: linear_user_manageable_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68845
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339434
-milestone: '14.3'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/development/log_response_length.yml b/config/feature_flags/development/log_response_length.yml
index 1ade057204c..689a262bec1 100644
--- a/config/feature_flags/development/log_response_length.yml
+++ b/config/feature_flags/development/log_response_length.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91448
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366854
 milestone: '15.3'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/limited_capacity_seat_refresh_worker_high.yml b/config/feature_flags/development/log_user_git_push_activity.yml
index 28f1c8a988e..5e45670a8cd 100644
--- a/config/feature_flags/development/limited_capacity_seat_refresh_worker_high.yml
+++ b/config/feature_flags/development/log_user_git_push_activity.yml
@@ -1,8 +1,8 @@
 ---
-name: limited_capacity_seat_refresh_worker_high
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104099
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382725
-milestone: '15.9'
+name: log_user_git_push_activity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112527
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393283
+milestone: "15.10"
 type: development
 group: group::utilization
 default_enabled: false
diff --git a/config/feature_flags/development/mr_show_reports_immediately.yml b/config/feature_flags/development/mr_show_reports_immediately.yml
index 23ac381a521..08cc49bcfd3 100644
--- a/config/feature_flags/development/mr_show_reports_immediately.yml
+++ b/config/feature_flags/development/mr_show_reports_immediately.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76612
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367027
 milestone: '15.2'
 type: development
-group: group::pipeline insights
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
index c282313f409..d97c6114a67 100644
--- a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
+++ b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105719
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384334
 milestone: '15.7'
 type: development
-group: group::release
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/non_public_artifacts.yml b/config/feature_flags/development/non_public_artifacts.yml
index e2a2fd49df7..74826abd7df 100644
--- a/config/feature_flags/development/non_public_artifacts.yml
+++ b/config/feature_flags/development/non_public_artifacts.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49775
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294503
 milestone: '13.8'
 type: development
-group: group::configure
+group: group::pipeline security
 default_enabled: false
diff --git a/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml b/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml
new file mode 100644
index 00000000000..7541a0dd24e
--- /dev/null
+++ b/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml
@@ -0,0 +1,8 @@
+---
+name: npm_allow_packages_in_multiple_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111775
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391692
+milestone: '15.10'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/pages_unique_domain.yml b/config/feature_flags/development/pages_unique_domain.yml
new file mode 100644
index 00000000000..7894cf5ceed
--- /dev/null
+++ b/config/feature_flags/development/pages_unique_domain.yml
@@ -0,0 +1,8 @@
+---
+name: pages_unique_domain
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109011
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388151
+milestone: '15.9'
+type: development
+group: group::editor
+default_enabled: false
diff --git a/config/feature_flags/development/permit_all_shared_groups_for_approval.yml b/config/feature_flags/development/permit_all_shared_groups_for_approval.yml
deleted file mode 100644
index 4ea3b7f696b..00000000000
--- a/config/feature_flags/development/permit_all_shared_groups_for_approval.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: permit_all_shared_groups_for_approval
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80655
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352766
-milestone: '14.8'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/disabled_mr_discussions_redis_cache.yml b/config/feature_flags/development/pipeline_trigger_merge_status.yml
index c4f0ca0effe..13c3996cbc0 100644
--- a/config/feature_flags/development/disabled_mr_discussions_redis_cache.yml
+++ b/config/feature_flags/development/pipeline_trigger_merge_status.yml
@@ -1,8 +1,8 @@
 ---
-name: disabled_mr_discussions_redis_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92752
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368366
-milestone: '15.3'
+name: pipeline_trigger_merge_status
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112525
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392989
+milestone: '15.10'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/present_groups_select_all.yml b/config/feature_flags/development/present_groups_select_all.yml
index 4d8ac160fa0..76445fd9b95 100644
--- a/config/feature_flags/development/present_groups_select_all.yml
+++ b/config/feature_flags/development/present_groups_select_all.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93633
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370306
 milestone: '15.5'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/profile_tabs_vue.yml b/config/feature_flags/development/profile_tabs_vue.yml
index 95fd4bbde27..7a8a30fed4b 100644
--- a/config/feature_flags/development/profile_tabs_vue.yml
+++ b/config/feature_flags/development/profile_tabs_vue.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109422
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388708
 milestone: '15.9'
 type: development
-group: group::organization
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/project_members_index_by_project_namespace.yml b/config/feature_flags/development/project_members_index_by_project_namespace.yml
index 0727c32143a..54735275869 100644
--- a/config/feature_flags/development/project_members_index_by_project_namespace.yml
+++ b/config/feature_flags/development/project_members_index_by_project_namespace.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105781
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384521
 milestone: '15.7'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: true
diff --git a/config/feature_flags/development/project_statistics_bulk_increment.yml b/config/feature_flags/development/project_statistics_bulk_increment.yml
index 6e8b9083a4d..2fa2b6d2611 100644
--- a/config/feature_flags/development/project_statistics_bulk_increment.yml
+++ b/config/feature_flags/development/project_statistics_bulk_increment.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103879
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385845
 milestone: '15.7'
 type: development
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_for_unauthenticated_projects_api_access.yml b/config/feature_flags/development/rate_limit_for_unauthenticated_projects_api_access.yml
new file mode 100644
index 00000000000..57b086f52be
--- /dev/null
+++ b/config/feature_flags/development/rate_limit_for_unauthenticated_projects_api_access.yml
@@ -0,0 +1,8 @@
+---
+name: rate_limit_for_unauthenticated_projects_api_access
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112283
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391922
+milestone: '15.10'
+type: development
+group: group::tenant scale
+default_enabled: false
diff --git a/config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml b/config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml
new file mode 100644
index 00000000000..507fce9cfe5
--- /dev/null
+++ b/config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml
@@ -0,0 +1,8 @@
+---
+name: reduce_sub_batch_size_on_timeouts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109354
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393556
+milestone: '15.10'
+type: development
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/remove_job_token_on_completion.yml b/config/feature_flags/development/refactor_ci_minutes_consumption.yml
index 4ab5ffc27ee..b24cf3d30b2 100644
--- a/config/feature_flags/development/remove_job_token_on_completion.yml
+++ b/config/feature_flags/development/refactor_ci_minutes_consumption.yml
@@ -1,8 +1,8 @@
 ---
-name: remove_job_token_on_completion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108021
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386871
-milestone: '15.8'
+name: refactor_ci_minutes_consumption
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112352
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392949
+milestone: '15.10'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml b/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml
new file mode 100644
index 00000000000..fb04e8310e5
--- /dev/null
+++ b/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml
@@ -0,0 +1,8 @@
+---
+name: restrict_special_characters_in_namespace_path
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111017
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390954
+milestone: '15.9'
+type: development
+group: group::tenant scale
+default_enabled: false
diff --git a/config/feature_flags/development/route_hll_to_snowplow_phase2.yml b/config/feature_flags/development/route_hll_to_snowplow_phase2.yml
deleted file mode 100644
index 2a3a820afd2..00000000000
--- a/config/feature_flags/development/route_hll_to_snowplow_phase2.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: route_hll_to_snowplow_phase2
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88482
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363562
-milestone: '15.1'
-type: development
-group: group::product intelligence
-default_enabled: true
diff --git a/config/feature_flags/development/license_from_gitaly.yml b/config/feature_flags/development/runner_machine_heartbeat.yml
index ad79d56a8ab..6f00fa47821 100644
--- a/config/feature_flags/development/license_from_gitaly.yml
+++ b/config/feature_flags/development/runner_machine_heartbeat.yml
@@ -1,8 +1,8 @@
 ---
-name: license_from_gitaly
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77041
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374300
-milestone: '15.5'
+name: runner_machine_heartbeat
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114859
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390261
+milestone: '15.10'
 type: development
-group: group::gitaly
+group: group::runner
 default_enabled: false
diff --git a/config/feature_flags/development/s3_multithreaded_uploads.yml b/config/feature_flags/development/s3_multithreaded_uploads.yml
index 6c3ecac4143..f2019f53275 100644
--- a/config/feature_flags/development/s3_multithreaded_uploads.yml
+++ b/config/feature_flags/development/s3_multithreaded_uploads.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50922
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296772
 milestone: '13.8'
 type: development
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: true
diff --git a/config/feature_flags/development/search_blobs_language_aggregation.yml b/config/feature_flags/development/search_index_integrity.yml
index da1b81dc52c..84e1e4b65c8 100644
--- a/config/feature_flags/development/search_blobs_language_aggregation.yml
+++ b/config/feature_flags/development/search_index_integrity.yml
@@ -1,8 +1,8 @@
 ---
-name: search_blobs_language_aggregation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71937
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342621
-milestone: '14.4'
+name: search_index_integrity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112369
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392981
+milestone: '15.10'
 type: development
 group: group::global search
 default_enabled: false
diff --git a/config/feature_flags/development/code_basic_search_files_by_regexp.yml b/config/feature_flags/development/search_index_partitioning_notes.yml
index e68581bdfbd..1abd3be35c5 100644
--- a/config/feature_flags/development/code_basic_search_files_by_regexp.yml
+++ b/config/feature_flags/development/search_index_partitioning_notes.yml
@@ -1,9 +1,8 @@
 ---
-name: code_basic_search_files_by_regexp
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109987
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389551
-milestone: '15.9'
+name: search_index_partitioning_notes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112402
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392376
+milestone: '15.10'
 type: development
 group: group::global search
 default_enabled: false
-
diff --git a/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml b/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml
deleted file mode 100644
index 1f26ffb28ae..00000000000
--- a/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: sec_mark_dropped_findings_as_resolved_scheduler
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108486
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387577
-milestone: '15.8'
-type: development
-group: group::static analysis
-default_enabled: false
diff --git a/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
index 2299b33db84..89f0804ad39 100644
--- a/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
+++ b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386860
 milestone: '15.8'
 type: development
 group: group::respond
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/set_traversal_ids_on_save.yml b/config/feature_flags/development/set_traversal_ids_on_save.yml
deleted file mode 100644
index ea07dafd9e4..00000000000
--- a/config/feature_flags/development/set_traversal_ids_on_save.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: set_traversal_ids_on_save
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104328
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383217
-milestone: '15.8'
-type: development
-group: group::organization
-default_enabled: false
diff --git a/config/feature_flags/development/show_group_readme.yml b/config/feature_flags/development/show_group_readme.yml
index b5764b9195f..6d581f79463 100644
--- a/config/feature_flags/development/show_group_readme.yml
+++ b/config/feature_flags/development/show_group_readme.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109480
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390230
 milestone: '15.9'
 type: development
-group: group::organization
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/revoke_ssh_signatures.yml b/config/feature_flags/development/show_tags_on_commits_view.yml
index de50bae7d1d..1dba952c33f 100644
--- a/config/feature_flags/development/revoke_ssh_signatures.yml
+++ b/config/feature_flags/development/show_tags_on_commits_view.yml
@@ -1,8 +1,8 @@
 ---
-name: revoke_ssh_signatures
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108344
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388986
-milestone: '15.9'
+name: show_tags_on_commits_view
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111493
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392003
+milestone: '15.10'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml b/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
index cd7acaceaf5..d6a0848d80b 100644
--- a/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
+++ b/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90871
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366086
 milestone: '15.2'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/rely_on_protected_branches_cache.yml b/config/feature_flags/development/synchronize_fork.yml
index 5154d4cee08..46307136c33 100644
--- a/config/feature_flags/development/rely_on_protected_branches_cache.yml
+++ b/config/feature_flags/development/synchronize_fork.yml
@@ -1,8 +1,8 @@
 ---
-name: rely_on_protected_branches_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92937
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370608
-milestone: '15.4'
+name: synchronize_fork
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114299
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395793
+milestone: '15.10'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/trial_email_validation.yml b/config/feature_flags/development/trial_email_validation.yml
deleted file mode 100644
index c658a49f195..00000000000
--- a/config/feature_flags/development/trial_email_validation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: trial_email_validation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92762
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368999
-milestone: '15.3'
-type: development
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/development/ultimate_feature_removal_banner.yml b/config/feature_flags/development/ultimate_feature_removal_banner.yml
index 14d7b4921c1..933e8ace9cc 100644
--- a/config/feature_flags/development/ultimate_feature_removal_banner.yml
+++ b/config/feature_flags/development/ultimate_feature_removal_banner.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94271
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371690
 milestone: '15.4'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml b/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml
deleted file mode 100644
index e7e220c310b..00000000000
--- a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: unlink_fork_network_upon_visibility_decrease
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20466
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369438
-milestone: '12.6'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/use_iid_in_work_items_path.yml b/config/feature_flags/development/use_iid_in_work_items_path.yml
deleted file mode 100644
index d2d328bbbc1..00000000000
--- a/config/feature_flags/development/use_iid_in_work_items_path.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_iid_in_work_items_path
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378349
-milestone: '15.5'
-type: development
-group: group::project management
-default_enabled: false
diff --git a/config/feature_flags/development/use_response_url_for_chat_responder.yml b/config/feature_flags/development/use_response_url_for_chat_responder.yml
deleted file mode 100644
index 84ac2a27fab..00000000000
--- a/config/feature_flags/development/use_response_url_for_chat_responder.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_response_url_for_chat_responder
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110625
-rollout_issue_url:
-milestone: '15.9'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/use_sub_repositories_api.yml b/config/feature_flags/development/use_sub_repositories_api.yml
new file mode 100644
index 00000000000..1ce845b46bf
--- /dev/null
+++ b/config/feature_flags/development/use_sub_repositories_api.yml
@@ -0,0 +1,8 @@
+---
+name: use_sub_repositories_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110664
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392372
+milestone: '15.10'
+type: development
+group: group::container registry
+default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids.yml b/config/feature_flags/development/use_traversal_ids.yml
index 3d566ddc3c0..51f0ba39025 100644
--- a/config/feature_flags/development/use_traversal_ids.yml
+++ b/config/feature_flags/development/use_traversal_ids.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56296
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321948
 milestone: '13.11'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml
index e2619ef5231..0ac765b6ab3 100644
--- a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67652
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340159
 milestone: '14.3'
 type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
index 4a89aac140d..64ba5b17513 100644
--- a/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57137
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334952
 milestone: '13.12'
 type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
index 9da967f87ea..910cf3e2d83 100644
--- a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72662
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343619
 milestone: '14.6'
 type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
index 3eece0b906a..74b6d6d2f70 100644
--- a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78542
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350637
 milestone: '14.8'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
index 00c6edfc148..be9fd0a25f0 100644
--- a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61163
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331907
 milestone: '14.0'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml
index 06bddc2aa1c..e1f1ec0df35 100644
--- a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76814
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348527
 milestone: '14.7'
 type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
index bdbfe33b16d..094534abc4d 100644
--- a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80045
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352120
 milestone: '14.8'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids_groups_finder.yml b/config/feature_flags/development/use_traversal_ids_groups_finder.yml
index 2f35ede7e87..f8a90bef1e6 100644
--- a/config/feature_flags/development/use_traversal_ids_groups_finder.yml
+++ b/config/feature_flags/development/use_traversal_ids_groups_finder.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67650
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345666
 milestone: '14.6'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids_roots.yml b/config/feature_flags/development/use_traversal_ids_roots.yml
index 3c0685dc872..d1f4cec7517 100644
--- a/config/feature_flags/development/use_traversal_ids_roots.yml
+++ b/config/feature_flags/development/use_traversal_ids_roots.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74148
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345438
 milestone: '14.5'
 type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml
index 77ee79fe80a..08a94fa80ce 100644
--- a/config/feature_flags/development/user_time_settings.yml
+++ b/config/feature_flags/development/user_time_settings.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321407
 milestone: '11.11'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/development/validate_environment_tier_presence.yml b/config/feature_flags/development/validate_environment_tier_presence.yml
index 78593e338a4..5cc16b36f19 100644
--- a/config/feature_flags/development/validate_environment_tier_presence.yml
+++ b/config/feature_flags/development/validate_environment_tier_presence.yml
@@ -3,5 +3,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111011
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391293
 milestone: '15.9'
 type: development
-group: group::release
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/vue_issues_dashboard.yml b/config/feature_flags/development/vue_issues_dashboard.yml
index 133343b3a3c..3091cf8b8b4 100644
--- a/config/feature_flags/development/vue_issues_dashboard.yml
+++ b/config/feature_flags/development/vue_issues_dashboard.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379025
 milestone: '15.6'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/webui_members_inherited_users.yml b/config/feature_flags/development/webui_members_inherited_users.yml
index 14704fd8341..a3efb05c140 100644
--- a/config/feature_flags/development/webui_members_inherited_users.yml
+++ b/config/feature_flags/development/webui_members_inherited_users.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83214
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364078
 milestone: '15.4'
 type: development
-group: group::workspace
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/experiment/generic_explore_groups.yml b/config/feature_flags/experiment/generic_explore_groups.yml
deleted file mode 100644
index d928dcd4189..00000000000
--- a/config/feature_flags/experiment/generic_explore_groups.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: generic_explore_groups
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103019"
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381564
-milestone: '15.6'
-type: experiment
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/experiment/invite_members_in_side_nav.yml b/config/feature_flags/experiment/invite_members_in_side_nav.yml
deleted file mode 100644
index 1cb8d6d2b0a..00000000000
--- a/config/feature_flags/experiment/invite_members_in_side_nav.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_in_side_nav
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342951
-milestone: '14.5'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/ops/advanced_user_index.yml b/config/feature_flags/ops/advanced_user_index.yml
deleted file mode 100644
index 2aa33aa265a..00000000000
--- a/config/feature_flags/ops/advanced_user_index.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: advanced_user_index
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110946
-rollout_issue_url: 
-milestone: '15.9'
-type: ops
-group: group::global_search
-default_enabled: true
diff --git a/config/feature_flags/ops/advanced_user_search.yml b/config/feature_flags/ops/advanced_user_search.yml
deleted file mode 100644
index 0f52e9f22f0..00000000000
--- a/config/feature_flags/ops/advanced_user_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: advanced_user_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102724
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382542
-milestone: '15.7'
-type: ops
-group: group::global search
-default_enabled: false
diff --git a/config/feature_flags/ops/auto_disabling_web_hooks.yml b/config/feature_flags/ops/auto_disabling_web_hooks.yml
new file mode 100644
index 00000000000..2eebdd3d1d9
--- /dev/null
+++ b/config/feature_flags/ops/auto_disabling_web_hooks.yml
@@ -0,0 +1,9 @@
+---
+name: auto_disabling_web_hooks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113479
+rollout_issue_url:
+milestone: '15.10'
+type: ops
+group: group::integrations
+default_enabled: false # Keep this value as false, as feature should be disabled by default for self-managed
+                       # https://gitlab.com/gitlab-org/gitlab/-/issues/390157.
diff --git a/config/feature_flags/ops/automatic_lock_writes_on_table.yml b/config/feature_flags/ops/automatic_lock_writes_on_table.yml
index 4e9ba8824a6..116814a1738 100644
--- a/config/feature_flags/ops/automatic_lock_writes_on_table.yml
+++ b/config/feature_flags/ops/automatic_lock_writes_on_table.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99287
 rollout_issue_url:
 milestone: '15.7'
 type: ops
-group: group::pods
+group: group::tenant scale
 default_enabled: true
diff --git a/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml b/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml
index 533900efdac..1e4e5ac3438 100644
--- a/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml
+++ b/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93179
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369441
 milestone: '15.3'
 type: ops
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: false
diff --git a/config/feature_flags/ops/detect_cross_database_modification.yml b/config/feature_flags/ops/detect_cross_database_modification.yml
index 5f496118c4b..6c94e81ba82 100644
--- a/config/feature_flags/ops/detect_cross_database_modification.yml
+++ b/config/feature_flags/ops/detect_cross_database_modification.yml
@@ -3,5 +3,5 @@ name: detect_cross_database_modification
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73316
 milestone: '14.5'
 type: ops
-group: group::sharding
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/ops/dynamic_image_resizing.yml b/config/feature_flags/ops/dynamic_image_resizing.yml
index 2b83b043a22..7ecf97d34a5 100644
--- a/config/feature_flags/ops/dynamic_image_resizing.yml
+++ b/config/feature_flags/ops/dynamic_image_resizing.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45050
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/266986
 milestone: '13.6'
 type: ops
-group: group::workspace
+group: group::tenant scale
 default_enabled: true
diff --git a/config/feature_flags/ops/dynamic_nonce.yml b/config/feature_flags/ops/dynamic_nonce.yml
deleted file mode 100644
index ad8c63f9fa3..00000000000
--- a/config/feature_flags/ops/dynamic_nonce.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dynamic_nonce
-introduced_by_url:
-rollout_issue_url:
-milestone: '14.0'
-type: ops
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/ops/legacy_open_source_license_available.yml b/config/feature_flags/ops/legacy_open_source_license_available.yml
index 36ee6c230bf..903212e90a0 100644
--- a/config/feature_flags/ops/legacy_open_source_license_available.yml
+++ b/config/feature_flags/ops/legacy_open_source_license_available.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79855
 rollout_issue_url:
 milestone: '14.8'
 type: ops
-group: 'group::workspace'
+group: 'group::tenant scale'
 default_enabled: true
diff --git a/config/feature_flags/ops/ops_prune_old_events.yml b/config/feature_flags/ops/ops_prune_old_events.yml
new file mode 100644
index 00000000000..3148afa633d
--- /dev/null
+++ b/config/feature_flags/ops/ops_prune_old_events.yml
@@ -0,0 +1,8 @@
+---
+name: ops_prune_old_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115100
+rollout_issue_url:
+milestone: '15.10'
+type: ops
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
index 8b54a0e3ff5..e3b27dfe8ea 100644
--- a/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
 rollout_issue_url:
 milestone: '15.1'
 type: ops
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: true
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml
index d16ee72ab71..5289bacae8e 100644
--- a/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
 rollout_issue_url:
 milestone: '15.8'
 type: ops
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: false
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml
index 73bfd16ec94..0c38b67a9cc 100644
--- a/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
 rollout_issue_url:
 milestone: '15.8'
 type: ops
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: false
diff --git a/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
index 9793eebb014..3fe041105dd 100644
--- a/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
+++ b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
@@ -3,5 +3,5 @@ name: query_analyzer_gitlab_schema_metrics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73839
 milestone: '14.5'
 type: ops
-group: group::sharding
+group: group::tenant scale
 default_enabled: false
diff --git a/config/feature_flags/ops/split_log_bulk_increment_counter.yml b/config/feature_flags/ops/split_log_bulk_increment_counter.yml
index ba8c3a7d22e..efc3f77b77b 100644
--- a/config/feature_flags/ops/split_log_bulk_increment_counter.yml
+++ b/config/feature_flags/ops/split_log_bulk_increment_counter.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111147
 rollout_issue_url:
 milestone: '15.9'
 type: ops
-group: group::pipeline insights
+group: group::pipeline security
 default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c89db25c347..e8a88628a8a 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -495,7 +495,6 @@ production: &base
   ## To switch to a Jira connect development environment
   jira_connect:
     # atlassian_js_url: 'http://localhost:9292/atlassian.js'
-    # enable_public_keys_storage: true
     # enforce_jira_base_url_https: false
     # additional_iframe_ancestors: ['localhost:*']
 
@@ -1168,6 +1167,16 @@ production: &base
     # client_id: 'YOUR_FORTI_TOKEN_CLOUD_CLIENT_ID'
     # client_secret: 'YOUR_FORTI_TOKEN_CLOUD_CLIENT_SECRET'
 
+  # Duo Auth settings
+  duo_auth:
+    # Allow using Duo as an OTP provider
+    enabled: false
+
+    # Client ID and Secret to access Duo's API
+    # integration_key: 'YOUR_DUO_INTEGRATION_KEY'
+    # secret_key: 'YOUR_DUO_SECRET_KEY'
+    # hostname: 'YOUR_DUO_API_FQDN'
+
   # Shared file storage settings
   shared:
     # path: /mnt/gitlab # Default: shared
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index c4be4cc1800..2c630c9c1be 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -244,6 +244,10 @@ p_ci_builds_metadata:
   - table: projects
     column: project_id
     on_delete: async_delete
+p_ci_runner_machine_builds:
+  - table: ci_runner_machines
+    column: runner_machine_id
+    on_delete: async_delete
 packages_build_infos:
   - table: ci_pipelines
     column: pipeline_id
@@ -280,6 +284,10 @@ vulnerability_occurrence_pipelines:
   - table: ci_pipelines
     column: pipeline_id
     on_delete: async_delete
+vulnerability_state_transitions:
+  - table: ci_pipelines
+    column: state_changed_at_pipeline_id
+    on_delete: async_nullify
 vulnerability_statistics:
   - table: ci_pipelines
     column: latest_pipeline_id
diff --git a/config/initializers/0_1_yaml_safe_load_file_patch.rb b/config/initializers/0_1_yaml_safe_load_file_patch.rb
new file mode 100644
index 00000000000..f43712900eb
--- /dev/null
+++ b/config/initializers/0_1_yaml_safe_load_file_patch.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# TODO: Remove this once we're on Ruby 3
+# https://gitlab.com/gitlab-org/gitlab/-/issues/393651
+unless YAML.respond_to?(:safe_load_file)
+  module YAML
+    # Temporary Ruby 2 back-compat workaround.
+    #
+    # This method only exists as of stdlib 3.0.0:
+    # https://ruby-doc.org/stdlib-3.0.0/libdoc/psych/rdoc/Psych.html
+    def self.safe_load_file(path, **options)
+      YAML.safe_load(File.read(path), **options)
+    end
+  end
+end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index a1637d8c339..9cb1be45b68 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -449,8 +449,6 @@ Settings.mattermost['host'] = nil unless Settings.mattermost.enabled
 Settings['jira_connect'] ||= Settingslogic.new({})
 
 Settings.jira_connect['atlassian_js_url'] ||= 'https://connect-cdn.atl-paas.net/all.js'
-Settings.jira_connect['enable_public_keys_storage'] ||= false
-Settings.jira_connect['enable_public_keys_storage'] = true if Gitlab.com?
 Settings.jira_connect['enforce_jira_base_url_https'] = true if Settings.jira_connect['enforce_jira_base_url_https'].nil?
 Settings.jira_connect['additional_iframe_ancestors'] ||= []
 
@@ -779,7 +777,7 @@ Gitlab.ee do
   Settings.cron_jobs['elastic_remove_expired_namespace_subscriptions_from_index_cron_worker']['cron'] ||= '10 3 * * *'
   Settings.cron_jobs['elastic_remove_expired_namespace_subscriptions_from_index_cron_worker']['job_class'] ||= 'ElasticRemoveExpiredNamespaceSubscriptionsFromIndexCronWorker'
   Settings.cron_jobs['elastic_migration_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['elastic_migration_worker']['cron'] ||= '*/30 * * * *'
+  Settings.cron_jobs['elastic_migration_worker']['cron'] ||= '*/5 * * * *'
   Settings.cron_jobs['elastic_migration_worker']['job_class'] ||= 'Elastic::MigrationWorker'
   Settings.cron_jobs['search_index_curation_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['search_index_curation_worker']['cron'] ||= '*/1 * * * *'
@@ -833,8 +831,11 @@ Gitlab.ee do
   Settings.cron_jobs['abandoned_trial_emails']['cron'] ||= "0 1 * * *"
   Settings.cron_jobs['abandoned_trial_emails']['job_class'] = 'Emails::AbandonedTrialEmailsCronWorker'
   Settings.cron_jobs['package_metadata_sync_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['package_metadata_sync_worker']['cron'] ||= "0 1 * * *"
+  Settings.cron_jobs['package_metadata_sync_worker']['cron'] ||= "*/5 * * * *"
   Settings.cron_jobs['package_metadata_sync_worker']['job_class'] = 'PackageMetadata::SyncWorker'
+  Settings.cron_jobs['compliance_violations_consistency_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['compliance_violations_consistency_worker']['cron'] ||= '0 1 * * *'
+  Settings.cron_jobs['compliance_violations_consistency_worker']['job_class'] = 'ComplianceManagement::MergeRequests::ComplianceViolationsConsistencyWorker'
   Gitlab.com do
     Settings.cron_jobs['free_user_cap_backfill_notification_jobs_worker'] ||= Settingslogic.new({})
     Settings.cron_jobs['free_user_cap_backfill_notification_jobs_worker']['cron'] ||= '*/5 * * * *'
@@ -856,7 +857,7 @@ end
 #
 Settings['sidekiq'] ||= Settingslogic.new({})
 Settings['sidekiq']['log_format'] ||= 'default'
-Settings['sidekiq']['routing_rules'] ||= []
+Settings['sidekiq']['routing_rules'] = Settings.build_sidekiq_routing_rules(Settings['sidekiq']['routing_rules'])
 
 #
 # GitLab Shell
@@ -1015,6 +1016,12 @@ Settings['forti_token_cloud'] ||= Settingslogic.new({})
 Settings.forti_token_cloud['enabled'] = false if Settings.forti_token_cloud['enabled'].nil?
 
 #
+# DuoAuth
+#
+Settings['duo_auth'] ||= Settingslogic.new({})
+Settings.duo_auth['enabled'] = false if Settings.duo_auth['enabled'].nil?
+
+#
 # Extra customization
 #
 Settings['extra'] ||= Settingslogic.new({})
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index 7773740fec4..85dee02cf01 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -5,6 +5,7 @@ require 'gitlab/redis'
 Redis.raise_deprecations = true unless Rails.env.production?
 
 Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor)
+Redis::Cluster::NodeLoader.prepend(Gitlab::Patch::NodeLoader)
 
 # Make sure we initialize a Redis connection pool before multi-threaded
 # execution starts by
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index 198c97cb849..19ca380a866 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -3,6 +3,17 @@
 module ActiveRecord
   module Associations
     class Preloader
+      def initialize(records: nil, associations: nil)
+        super()
+
+        @records = records
+        @associations = associations
+      end
+
+      def call
+        preload(@records, @associations)
+      end
+
       class NullPreloader
         def self.new(*args, **kwargs)
           self
diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb
index 6053154489f..cb476d9f01a 100644
--- a/config/initializers/carrierwave_patch.rb
+++ b/config/initializers/carrierwave_patch.rb
@@ -43,7 +43,7 @@ module CarrierWave
         end
 
         def authenticated_url(options = {})
-          if %w[AWS Google Rackspace OpenStack AzureRM].include?(@uploader.fog_credentials[:provider])
+          if %w[AWS Google AzureRM].include?(@uploader.fog_credentials[:provider])
             # avoid a get by using local references
             local_directory = connection.directories.new(key: @uploader.fog_directory)
             local_file = local_directory.files.new(key: path)
@@ -51,10 +51,6 @@ module CarrierWave
             case @uploader.fog_credentials[:provider]
             when 'AWS', 'Google', 'AzureRM'
               local_file.url(expire_at, options)
-            when 'Rackspace'
-              connection.get_object_https_url(@uploader.fog_directory, path, expire_at, options)
-            when 'OpenStack'
-              connection.get_object_https_url(@uploader.fog_directory, path, expire_at)
             else
               local_file.url(expire_at)
             end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index d24c5431f53..918b2767c4d 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -121,17 +121,3 @@ Doorkeeper.configure do
   # We might want to disable this in the future, see https://gitlab.com/gitlab-org/gitlab/-/issues/323615
   skip_client_authentication_for_password_grant true
 end
-
-module Doorkeeper
-  class AccessToken
-    # Doorkeeper OAuth Token refresh uses expires_in of refresh token for new token
-    # https://github.com/doorkeeper-gem/doorkeeper/pull/1366
-    # This override ensures that tokens with expires_in: nil do not create new
-    # tokens with expires_in: nil during refresh flow.
-    # Can be removed after https://gitlab.com/gitlab-org/gitlab/-/issues/386094 is
-    # closed
-    def expires_in
-      super || 2.hours
-    end
-  end
-end
diff --git a/config/initializers/fog_core_patch.rb b/config/initializers/fog_core_patch.rb
index 053e0460a19..f7d81f26be5 100644
--- a/config/initializers/fog_core_patch.rb
+++ b/config/initializers/fog_core_patch.rb
@@ -27,12 +27,11 @@
 # closed:
 #
 # fog-google: https://github.com/fog/fog-google/issues/421
-# fog-rackspace: https://github.com/fog/fog-rackspace/issues/29
 # fog-aliyun: https://github.com/fog/fog-aliyun/issues/23
 module Fog
   module ServicesMixin
     # Gems that have not yet updated with the new fog-core namespace
-    LEGACY_FOG_PROVIDERS = %w(google rackspace aliyun).freeze
+    LEGACY_FOG_PROVIDERS = %w(google aliyun).freeze
 
     # rubocop:disable Gitlab/ConstGetInheritFalse
     def service_provider_constant(service_name, provider_name)
diff --git a/config/initializers/google_cloud_profiler.rb b/config/initializers/google_cloud_profiler.rb
new file mode 100644
index 00000000000..8254f6d0e02
--- /dev/null
+++ b/config/initializers/google_cloud_profiler.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+return unless Gitlab::Utils.to_boolean(ENV['GITLAB_GOOGLE_CLOUD_PROFILER_ENABLED'])
+return unless ENV['GITLAB_GOOGLE_CLOUD_PROFILER_PROJECT_ID']
+
+# For the initial iteration, we enable it only for `web`.
+# This is because we have global service accounts configured this way, details:
+# https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/17492#note_1303914983
+return unless Gitlab::Runtime.puma?
+
+Gitlab::Cluster::LifecycleEvents.on_worker_start do
+  require 'cloud_profiler_agent'
+
+  agent = CloudProfilerAgent::Agent.new(
+    service: 'gitlab-web',
+    project_id: ENV['GITLAB_GOOGLE_CLOUD_PROFILER_PROJECT_ID'],
+    logger: ::Gitlab::AppJsonLogger.build,
+    log_labels: {
+      message: 'Google Cloud Profiler Ruby',
+      pid: $$,
+      worker_id: ::Prometheus::PidProvider.worker_id
+    }
+  )
+  agent.start
+end
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 61e357808d9..e5abc0b919b 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -8,7 +8,7 @@ unless Gitlab::Runtime.sidekiq?
     Rails.application.configure do
       config.lograge.enabled = true
       # Store the lograge JSON files in a separate file
-      config.lograge.keep_original_rails_log = Gitlab::Utils.to_boolean(ENV.fetch('UNSTRUCTURED_RAILS_LOG', 'true'))
+      config.lograge.keep_original_rails_log = Gitlab::Utils.to_boolean(ENV.fetch('UNSTRUCTURED_RAILS_LOG', 'false'))
       # Don't use the Logstash formatter since this requires logstash-event, an
       # unmaintained gem that monkey patches `Time`
       config.lograge.formatter = Lograge::Formatters::Json.new
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index e7f29ee1a84..572c8439ec1 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -5,7 +5,8 @@ Gitlab::Database::Partitioning.register_models(
     AuditEvent,
     WebHookLog,
     LooseForeignKeys::DeletedRecord,
-    Gitlab::Database::BackgroundMigration::BatchedJobTransitionLog
+    Gitlab::Database::BackgroundMigration::BatchedJobTransitionLog,
+    Ci::RunnerMachineBuild
   ])
 
 if Gitlab.ee?
diff --git a/config/initializers/safe_session_store_patch.rb b/config/initializers/safe_session_store_patch.rb
new file mode 100644
index 00000000000..7d3b9d0ae36
--- /dev/null
+++ b/config/initializers/safe_session_store_patch.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# The Rails and Rack session stores allow developers to store arbitrary
+# Ruby objects in the Hash, which gets serialized to Redis. However,
+# serializing objects may lead to multi-version incompatibilities
+# (https://docs.gitlab.com/ee/development/multi_version_compatibility.html)
+# because there is no guarantee that the Ruby object is present in an
+# older version.
+#
+# To safeguard against this problem, this patch checks that objects
+# stored in the session are in an allow list. Note that these checks are
+# restricted to test and development environments at the moment. Only
+# add to the allow list if you know that the object should be handled
+# gracefully in a mixed deployment.
+return unless Rails.env.test? || Rails.env.development?
+
+module Rack
+  module Session
+    module Abstract
+      class SessionHash
+        module BlockRubyObjectSerialization
+          ALLOWED_OBJECTS = [
+            Symbol, String, Integer, Float, NilClass, TrueClass, FalseClass, ActiveSupport::SafeBuffer,
+            # Used in app/controllers/import/bitbucket_controller.rb
+            ActiveSupport::Duration, ActiveSupport::TimeWithZone,
+            # Used in ee/app/controllers/groups/omniauth_callbacks_controller.rb
+            OmniAuth::AuthHash, OmniAuth::AuthHash::InfoHash, OneLogin::RubySaml::Attributes,
+            OneLogin::RubySaml::Response
+          ].freeze
+
+          def []=(key, value)
+            unless safe_object?(value)
+              # rubocop:disable Gitlab/DocUrl
+              raise "Session attempted to store type #{value.class} with key '#{key}': #{value.inspect}.\n" \
+                    "Serializing novel Ruby objects can cause uninitialized constants in mixed deployments.\n" \
+                    "See https://docs.gitlab.com/ee/development/multi_version_compatibility.html"
+              # rubocop:enable Gitlab/DocUrl
+            end
+
+            super
+          end
+
+          private
+
+          def safe_object?(value)
+            return allowed_mock?(value) if Rails.env.test? && value.is_a?(RSpec::Mocks::InstanceVerifyingDouble)
+
+            case value
+            when Array
+              value.all? { |entry| safe_object?(entry) }
+            when Hash
+              safe_hash?(value)
+            else
+              ALLOWED_OBJECTS.include?(value.class)
+            end
+          end
+
+          def safe_hash?(value)
+            value.each do |key, val|
+              return false unless safe_object?(key)
+              return false unless safe_object?(val)
+            end
+          end
+
+          def allowed_mock?(value)
+            doubled_module = value.to_s
+
+            # We don't have access to the @doubled_module variable, but the output
+            # string will be in the form: "#[InstanceDouble(OneLogin::RubySaml::Response) (anonymous)]"
+            ALLOWED_OBJECTS.any? { |allowed| doubled_module.include?("InstanceDouble(#{allowed})") }
+          end
+        end
+
+        prepend BlockRubyObjectSerialization
+      end
+    end
+  end
+end
+
+ActionDispatch::Request::Session.prepend(Rack::Session::Abstract::SessionHash::BlockRubyObjectSerialization)
diff --git a/config/initializers_before_autoloader/001_fast_gettext.rb b/config/initializers_before_autoloader/001_fast_gettext.rb
index 3d54ed8f32f..01aec95ce53 100644
--- a/config/initializers_before_autoloader/001_fast_gettext.rb
+++ b/config/initializers_before_autoloader/001_fast_gettext.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../lib/gitlab/i18n'
+require_relative '../../lib/gitlab/i18n/pluralization'
 
 Gitlab::I18n.setup(domain: 'gitlab', default_locale: :en)
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb
index 8b3cdf1a80c..72e471d25f2 100644
--- a/config/initializers_before_autoloader/004_zeitwerk.rb
+++ b/config/initializers_before_autoloader/004_zeitwerk.rb
@@ -65,7 +65,6 @@ Rails.autoloaders.each do |autoloader|
     'function_uri' => 'FunctionURI',
     'uuid' => 'UUID',
     'occurrence_uuid' => 'OccurrenceUUID',
-    'vulnerability_uuid' => 'VulnerabilityUUID',
-    'vs_code_extension_activity_unique_counter' => 'VSCodeExtensionActivityUniqueCounter'
+    'vulnerability_uuid' => 'VulnerabilityUUID'
   )
 end
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 07ad35e45bf..3029047f4ad 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -17,7 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type:
-- gmau
-- paid_gmau
+performance_indicator_type: []
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index a6bfeed7059..d4411c5e153 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
 description: Count of unique users per month who created a MR
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 8a57e5989c4..ac55cb82f8f 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
 description: Distinct users creating pipeline schedules in a month
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index dfe24039f52..616368ec513 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts_monthly.snippets
 description: Monthly count of All Snippets
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index dd66f4a3b47..9d56815712f 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -7,7 +7,9 @@ product_stage: create
 product_group: editor
 product_category: web_ide
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111351
+milestone_removed: 15.9
 time_frame: 28d
 data_source: redis_hll
 distribution:
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index 8dbf5e5ba41..592b02c84bc 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -7,7 +7,9 @@ product_stage: create
 product_group: editor
 product_category: web_ide
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
+milestone_removed: 15.10
 time_frame: 28d
 data_source: redis_hll
 distribution:
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 5a2d9c197ce..012f9db8c80 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -7,7 +7,9 @@ product_stage: create
 product_group: editor
 product_category: snippets
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
+milestone_removed: 15.10
 time_frame: 28d
 data_source: redis_hll
 distribution:
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 78622d0fc18..1eda8cb2467 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
 description: Number of users editing a file from the single file editor
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 12b9e922a1c..2bcd22eb7fc 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -5,7 +5,7 @@ description: Internal Tracking to count number of unit tests parsed for planning
   future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: code_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index b65141906e8..ab7e89ce449 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -5,7 +5,7 @@ description: List of unique OmniAuth providers
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: object
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 90c053612cf..ac6500672c2 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -7,7 +7,9 @@ product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113422
+milestone_removed: 15.10
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: AggregatedMetric
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 43a8a2340eb..c219ea4dbfd 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
 description: Count of pipelines with implicit Auto DevOps runs
 product_section: ops
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index a5a6bcd1a93..ff4231231aa 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -57,6 +57,7 @@ options:
   - p_ci_templates_security_dependency_scanning
   - p_ci_templates_security_api_fuzzing
   - p_ci_templates_security_dast
+  - p_ci_templates_security_api_discovery
   - p_ci_templates_ios_fastlane
   - p_ci_templates_composer
   - p_ci_templates_c
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index 65b9764cf10..498569c95aa 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report
 description: Count of expanding the code quality widget
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: code_quality
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index 601fc6fdab3..d800cd2f3e9 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_repor
 description: Count of expanding the accessibility report widget
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: accessibility_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index 49cab313fc8..ed25f2c18a8 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_summary_widget_total_monthly
 description: Unique users that expand the test summary merge request widget by month
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index 8a0005a5c5c..802fc03bee4 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -16,7 +16,9 @@ tier:
   - free
   - premium
   - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- gmau
+- paid_gmau
 time_frame: 28d
 instrumentation_class: AggregatedMetric
 data_source: redis_hll
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 0ee3d694317..7aad160f01d 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -5,7 +5,7 @@ description: Number of unique user logins using two factor authentication for av
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: object
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml b/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
index 341d3810318..cd124735153 100644
--- a/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
+++ b/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_test_report_uploaded_monthly
 description: "MAU of junit test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
index ef51a24bc1e..a3d47aa4c49 100644
--- a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
+++ b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_coverage_report_uploaded_monthly
 description: "MAU of coverage test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
index dca8545691a..e081e74b967 100644
--- a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
@@ -11,7 +11,7 @@ milestone: "15.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869
 time_frame: 28d
 data_source: redis_hll
-data_category: optional
+data_category: operational
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
diff --git a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
index 8f73011a6ed..97a74e44f65 100644
--- a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
+++ b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_active_user_monthly
 description: Count of monthly active users for pipeline insights features
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
new file mode 100644
index 00000000000..1fa9772ae67
--- /dev/null
+++ b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_discovery_monthly
+description: Monthly counts for API Discovery CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110493
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_api_discovery
diff --git a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
new file mode 100644
index 00000000000..5d927562f42
--- /dev/null
+++ b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
@@ -0,0 +1,23 @@
+---
+key_path: counts_monthly.ci_internal_pipelines
+description: Total monthly (28D) pipelines in Gitlab repositories for all project and project types
+product_section: ops
+product_stage: verify
+product_group: pipeline_execution
+product_category: continuous_integration
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112370
+time_frame: 28d
+data_source: database
+data_category: operational
+instrumentation_class: CountCiInternalPipelinesMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
new file mode 100644
index 00000000000..4304dcd0c25
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
@@ -0,0 +1,27 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration_finished_with_failures
+description: Count of group entities with finished status and failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+  source_type: group_entity
+  status: 2
+  has_failures: true
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
new file mode 100644
index 00000000000..376e9bd5baa
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
@@ -0,0 +1,27 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration_finished_without_failures
+description: Count of group entities with finished status and without failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+  source_type: group_entity
+  status: 2
+  has_failures: false
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
new file mode 100644
index 00000000000..5b0e4db64ad
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
@@ -0,0 +1,27 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration_finished_with_failures
+description: Count of project entities with finished status and failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+  source_type: project_entity
+  status: 2
+  has_failures: true
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
new file mode 100644
index 00000000000..163a7f0ccd6
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
@@ -0,0 +1,27 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration_finished_without_failures
+description: Count of project entities with finished status and without failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+  source_type: project_entity
+  status: 2
+  has_failures: false
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
new file mode 100644
index 00000000000..f398fa3c16f
--- /dev/null
+++ b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_cancelled_monthly
+description: The number of github projects that were cancelled monthly
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - github_import_project_cancelled
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
new file mode 100644
index 00000000000..10344cffe5f
--- /dev/null
+++ b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_partially_completed_monthly
+description: The number of github projects that were partially completed monthly
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - github_import_project_partially_completed
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index 49d882f893b..d7c2bf1ad31 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -5,7 +5,7 @@ description: Internal Tracking to count number of unit tests parsed for planning
   future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: code_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 07985c3e56e..4c12bd72f94 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -7,7 +7,9 @@ product_group: code_review
 product_category: code_review
 product_section: 'TBD'
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113422
+milestone_removed: 15.10
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: AggregatedMetric
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 71c02fc5681..eb46f571691 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -57,6 +57,7 @@ options:
   - p_ci_templates_security_dependency_scanning
   - p_ci_templates_security_api_fuzzing
   - p_ci_templates_security_dast
+  - p_ci_templates_security_api_discovery
   - p_ci_templates_ios_fastlane
   - p_ci_templates_composer
   - p_ci_templates_c
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index a8686e59e13..f3e90cb077b 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report
 description: Count of expanding the code quality widget
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: code_quality
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index bbad1715f98..096f2f0c7f6 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_repor
 description: Count of expanding the accessibility report widget
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: accessibility_testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index f9c34ab4fe9..015fd1e99b0 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_summary_widget_total_weekly
 description: Unique users that expand the test summary merge request widget by week
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
index 814a50554c1..650f85f765b 100644
--- a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
+++ b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_test_report_uploaded_weekly
 description: "MAU of junit test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
index be6ba98c10c..86fefb257f6 100644
--- a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
+++ b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_coverage_report_uploaded_weekly
 description: "MAU of coverage test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
index 43405d5bd2c..0ab553a7b5c 100644
--- a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
@@ -11,7 +11,7 @@ milestone: "15.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869
 time_frame: 7d
 data_source: redis_hll
-data_category: optional
+data_category: operational
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
diff --git a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
index d1c553601e6..38e6e0469f4 100644
--- a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
+++ b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_active_user_weekly
 description: Count of weekly active users for pipeline insights features
 product_section: ops
 product_stage: verify
-product_group: pipeline_insights
+product_group: pipeline_execution
 product_category: testing
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
new file mode 100644
index 00000000000..ca16ef38e82
--- /dev/null
+++ b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_discovery_weekly
+description: Weekly counts for API Discovery CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: active
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110493
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_api_discovery
diff --git a/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml b/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
new file mode 100644
index 00000000000..2d76d88e2e7
--- /dev/null
+++ b/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_cancelled_weekly
+description: The number of github projects that were cancelled weekly
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - github_import_project_cancelled
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml b/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
new file mode 100644
index 00000000000..9bc42eafd23
--- /dev/null
+++ b/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_partially_completed_weekly
+description: The number of github projects that were partially completed weekly
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - github_import_project_partially_completed
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index cc000031e83..a22520cb97d 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
 time_frame: all
 data_source: database
 distribution:
@@ -19,3 +19,5 @@ tier:
 - ultimate
 performance_indicator_type: []
 milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112571
+milestone_removed: "15.10"
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index d607f3d6aea..092036b3a5b 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
 time_frame: all
 data_source: database
 distribution:
@@ -19,3 +19,5 @@ tier:
 - ultimate
 performance_indicator_type: []
 milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112571
+milestone_removed: "15.10"
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index f86b5bd5f84..44585ed6916 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -1,5 +1,5 @@
 ---
-data_category: optional
+data_category: operational
 key_path: counts.web_ide_commits
 description: Count of commits made from the Web IDE
 product_section: dev
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index dad2a777d26..afa2559310d 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -5,7 +5,7 @@ description: Number of keys.
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index f4d6e2bc57b..aa314730665 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -5,7 +5,7 @@ description: List of unique OmniAuth providers
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: object
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index 98ac9ace52f..c183edf1836 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -5,7 +5,7 @@ description: Number of unique user logins using two factor authentication for av
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: object
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
new file mode 100644
index 00000000000..9a24543390a
--- /dev/null
+++ b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_inheriting_google_play_active
+description: Count of active projects inheriting integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222192643_projects_google_play_active.yml b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
new file mode 100644
index 00000000000..712a9b9cac1
--- /dev/null
+++ b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_google_play_active
+description: Count of projects with active integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
new file mode 100644
index 00000000000..00f99ed13f4
--- /dev/null
+++ b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.instances_google_play_active
+description: Count of instances with active integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
new file mode 100644
index 00000000000..1dad27560b6
--- /dev/null
+++ b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_inheriting_google_play_active
+description: Count of active groups inheriting integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222193255_groups_google_play_active.yml b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
new file mode 100644
index 00000000000..fe83398f9ec
--- /dev/null
+++ b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_google_play_active
+description: Count of active groups inheriting integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
new file mode 100644
index 00000000000..294c044affb
--- /dev/null
+++ b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_inheriting_squash_tm_active
+description: Count of active groups inheriting integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
new file mode 100644
index 00000000000..0ccadb78bf0
--- /dev/null
+++ b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.groups_squash_tm_active
+description: Count of groups with active integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
new file mode 100644
index 00000000000..9f35216ddaf
--- /dev/null
+++ b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.instances_squash_tm_active
+description: Count of instance-level integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
new file mode 100644
index 00000000000..25944bfe05a
--- /dev/null
+++ b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_inheriting_squash_tm_active
+description: Count of active projects inheriting integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
new file mode 100644
index 00000000000..fedc0a801ba
--- /dev/null
+++ b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.projects_squash_tm_active
+description: Count of projects with active integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
new file mode 100644
index 00000000000..1c1d126e458
--- /dev/null
+++ b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.container_registry_events_i_container_registry_delete_manifest
+name: manifest_delete_events
+description: A count of manifests that have been deleted
+product_section: ops
+product_stage: package
+product_group: package
+product_category: container registry
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113440
+time_frame: all
+data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: container_registry_events
+  event: i_container_registry_delete_manifest
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20230228110448_installation_creation_date.yml b/config/metrics/license/20230228110448_installation_creation_date.yml
new file mode 100644
index 00000000000..53f9438ba0f
--- /dev/null
+++ b/config/metrics/license/20230228110448_installation_creation_date.yml
@@ -0,0 +1,22 @@
+---
+key_path: installation_creation_date
+description: "The date and time the instance was installed"
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
+value_type: string
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113090
+time_frame: none
+data_source: database
+data_category: operational
+instrumentation_class: InstallationCreationDateMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20230314161014_gitlab_dedicated.yml b/config/metrics/license/20230314161014_gitlab_dedicated.yml
new file mode 100644
index 00000000000..0495277077f
--- /dev/null
+++ b/config/metrics/license/20230314161014_gitlab_dedicated.yml
@@ -0,0 +1,20 @@
+---
+key_path: gitlab_dedicated
+description: Is the instance a Gitlab Dedicated instance
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
+product_category: collection
+value_type: boolean
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114717
+time_frame: none
+data_source: database
+data_category: optional
+instrumentation_class: GitlabDedicatedMetric
+performance_indicator_type: []
+distribution:
+- ee
+tier:
+- ultimate
diff --git a/config/metrics/objects_schemas/index_inconsistencies_metric.json b/config/metrics/objects_schemas/index_inconsistencies_metric.json
new file mode 100644
index 00000000000..635cfa64d95
--- /dev/null
+++ b/config/metrics/objects_schemas/index_inconsistencies_metric.json
@@ -0,0 +1,19 @@
+{
+  "type": "array",
+  "items": {
+    "type": [
+      {
+        "type": "object",
+        "properties": {
+          "object_name": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "description": "Type of index inconsistency"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 2c506cb40fc..d25cb1d2628 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -5,7 +5,7 @@ description: Whether LDAP is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 83ea666a331..0939ce43903 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -5,7 +5,7 @@ description: Whether OmniAuth is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index df7f03a7d2e..9371a08613d 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -5,7 +5,7 @@ description: Whether public signup is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: authentication_and_authorization
+product_category: system_access
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
new file mode 100644
index 00000000000..5076eb9cdd8
--- /dev/null
+++ b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
@@ -0,0 +1,25 @@
+---
+key_path: index_inconsistencies
+name: "index_inconsistencies"
+description: "List the index inconsistencies in the database"
+product_section: enablement
+product_stage: enablement
+product_group: database
+product_category: database
+value_type: object
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111015
+time_frame: none
+data_source: system
+data_category: optional
+instrumentation_class: IndexInconsistenciesMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: "config/metrics/objects_schemas/index_inconsistencies_metric.json"
diff --git a/config/routes.rb b/config/routes.rb
index 8530923aa1a..589d44c3de6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,6 +29,7 @@ InitializerConnections.raise_if_new_database_connection do
                   token_info: 'oauth/token_info',
                   tokens: 'oauth/tokens'
     end
+    put '/oauth/applications/:id/renew(.:format)' => 'oauth/applications#renew', as: :renew_oauth_application
 
     # This prefixless path is required because Jira gets confused if we set it up with a path
     # More information: https://gitlab.com/gitlab-org/gitlab/issues/6752
@@ -87,6 +88,7 @@ InitializerConnections.raise_if_new_database_connection do
 
     # JSON Web Token
     get 'jwt/auth' => 'jwt#auth'
+    post 'jwt/auth', to: proc { [404, {}, ['']] }
 
     # Health check
     get 'health_check(/:checks)' => 'health_check#index', as: :health_check
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 9181c1c94cf..85c7951e1ea 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -44,7 +44,9 @@ namespace :admin do
     end
   end
 
-  resources :applications
+  resources :applications do
+    put 'renew', on: :member
+  end
 
   resources :groups, only: [:index, :new, :create]
 
@@ -121,6 +123,10 @@ namespace :admin do
       member do
         put :transfer
         post :repository_check
+        get :edit, action: :edit
+        get '/', action: :show
+        patch '/', action: :update
+        put '/', action: :update
       end
 
       resources :runner_projects, only: [:create, :destroy]
@@ -168,6 +174,7 @@ namespace :admin do
 
   resources :runners, only: [:index, :new, :show, :edit, :update, :destroy] do
     member do
+      get :register
       post :resume
       post :pause
     end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 582f8bf9471..22c63482afa 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -56,7 +56,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         end
       end
 
-      resources :applications
+      resources :applications do
+        put 'renew', on: :member
+      end
 
       resource :packages_and_registries, only: [:show]
     end
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 2513cd04cfb..a1f441c4e51 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -23,6 +23,7 @@ namespace :import do
     get :realtime_changes
     post :cancel
     post :cancel_all
+    get :counts
   end
 
   resource :gitea, only: [:create, :new], controller: :gitea do
diff --git a/config/routes/issues.rb b/config/routes/issues.rb
index 25e59022272..13fdde5841b 100644
--- a/config/routes/issues.rb
+++ b/config/routes/issues.rb
@@ -14,6 +14,10 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do
     post :create_merge_request
     get :discussions, format: :json
     get '/designs(/*vueroute)', to: 'issues#designs', as: :designs, format: false
+    get '/:incident_tab',
+      action: :show,
+      as: :incident_issue,
+      constraints: { incident_tab: /timeline|metrics|alerts/ }
   end
 
   collection do
@@ -23,9 +27,10 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do
     post :export_csv
 
     scope :incident do
-      get '/:id',
+      get '/:id(/:incident_tab)',
         to: 'incidents#show',
-        as: :incident
+        as: :incident,
+        constraints: { incident_tab: /timeline|metrics|alerts/ }
     end
   end
 
diff --git a/config/routes/profile.rb b/config/routes/profile.rb
index bee1a0f108e..2d0d3fb66f0 100644
--- a/config/routes/profile.rb
+++ b/config/routes/profile.rb
@@ -39,7 +39,7 @@ resource :profile, only: [:show, :update] do
     end
     resource :preferences, only: [:show, :update]
 
-    resources :saved_replies, only: [:index], action: :index
+    resources :saved_replies, only: [:index, :show], action: :index
 
     resources :keys, only: [:index, :show, :create, :destroy] do
       member do
@@ -75,7 +75,6 @@ resource :profile, only: [:show, :update] do
 
     resource :two_factor_auth, only: [:show, :create, :destroy] do
       member do
-        post :create_u2f
         post :codes
         patch :skip
         post :create_webauthn
diff --git a/config/routes/project.rb b/config/routes/project.rb
index cf19111b2e2..ceb0671c034 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -473,10 +473,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           resources :experiments, only: [:index, :show], controller: 'experiments'
           resources :candidates, only: [:show], controller: 'candidates', param: :iid
         end
-
-        namespace :airflow do
-          resources :dags, only: [:index, :show], controller: 'dags'
-        end
       end
       # End of the /-/ scope.
 
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index 0202eb80b23..60d3d37bdc8 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -75,6 +75,7 @@ scope format: false do
 
     get '/tree/*id', to: 'tree#show', as: :tree
     get '/raw/*id', to: 'raw#show', as: :raw
+    get '/blame_page/*id', to: 'blame#page', as: :blame_page
     get '/blame/*id', to: 'blame#show', as: :blame
 
     get '/commits', to: 'commits#commits_root', as: :commits_root
diff --git a/config/settings.rb b/config/settings.rb
index ae95af802c4..a76889f34ae 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -172,6 +172,13 @@ class Settings < Settingslogic
       cron_jobs['gitlab_service_ping_worker']['cron'] ||= cron_for_service_ping
     end
 
+    # Route jobs to queue based on worker name.
+    def build_sidekiq_routing_rules(rules)
+      return rules unless rules.nil? || rules&.empty?
+
+      [[Gitlab::SidekiqConfig::WorkerMatcher::WILDCARD_MATCH, nil]]
+    end
+
     private
 
     def base_url(config)
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 17440acddc3..e1de1b5d7c9 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -177,6 +177,8 @@
   - 1
 - - elastic_namespace_rollout
   - 1
+- - elastic_namespace_update
+  - 1
 - - elastic_project_transfer
   - 1
 - - email_receiver
@@ -419,12 +421,18 @@
   - 1
 - - projects_finalize_project_statistics_refresh
   - 1
+- - projects_forks_sync
+  - 1
 - - projects_git_garbage_collect
   - 1
+- - projects_import_export_create_relation_exports
+  - 1
 - - projects_import_export_parallel_project_export
   - 1
 - - projects_import_export_relation_export
   - 1
+- - projects_import_export_wait_relation_exports
+  - 1
 - - projects_inactive_projects_deletion_notification
   - 1
 - - projects_post_creation
@@ -481,6 +489,10 @@
   - 1
 - - sbom_reports
   - 1
+- - search_namespace_index_integrity
+  - 1
+- - search_project_index_integrity
+  - 1
 - - security_auto_fix
   - 1
 - - security_orchestration_policy_rule_schedule_namespace
diff --git a/config/vue3migration/compiler.js b/config/vue3migration/compiler.js
new file mode 100644
index 00000000000..bb92e1e2356
--- /dev/null
+++ b/config/vue3migration/compiler.js
@@ -0,0 +1,50 @@
+const { parse, compile: compilerDomCompile } = require('@vue/compiler-dom');
+
+const getPropIndex = (node, prop) => node.props?.findIndex((p) => p.name === prop) ?? -1;
+
+function modifyKeysInsideTemplateTag(templateNode) {
+  let keyCandidate = null;
+  for (const node of templateNode.children) {
+    const keyBindingIndex = node.props
+      ? node.props.findIndex((prop) => prop.arg && prop.arg.content === 'key')
+      : -1;
+
+    if (keyBindingIndex !== -1 && getPropIndex(node, 'for') === -1) {
+      if (!keyCandidate) {
+        keyCandidate = node.props[keyBindingIndex];
+      }
+      node.props.splice(keyBindingIndex, 1);
+    }
+  }
+
+  if (keyCandidate) {
+    templateNode.props.push(keyCandidate);
+  }
+}
+
+module.exports = {
+  parse,
+  compile(template, options) {
+    const rootNode = parse(template, options);
+    const pendingNodes = [rootNode];
+    while (pendingNodes.length) {
+      const currentNode = pendingNodes.pop();
+      if (getPropIndex(currentNode, 'for') !== -1) {
+        if (currentNode.tag === 'template') {
+          // This one will be dropped all together with compiler when we drop Vue.js 2 support
+          modifyKeysInsideTemplateTag(currentNode);
+        }
+
+        // This one will be dropped when https://github.com/vuejs/core/issues/7725 will be fixed
+        const vOncePropIndex = getPropIndex(currentNode, 'once');
+        if (vOncePropIndex !== -1) {
+          currentNode.props.splice(vOncePropIndex, 1);
+        }
+      }
+
+      currentNode.children?.forEach((child) => pendingNodes.push(child));
+    }
+
+    return compilerDomCompile(rootNode, options);
+  },
+};
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8ae803ca738..3308fa3d210 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -1,6 +1,19 @@
 // eslint-disable-next-line import/order
 const crypto = require('./helpers/patched_crypto');
 
+const { VUE_VERSION: EXPLICIT_VUE_VERSION } = process.env;
+if (![undefined, '2', '3'].includes(EXPLICIT_VUE_VERSION)) {
+  throw new Error(
+    `Invalid VUE_VERSION value: ${EXPLICIT_VUE_VERSION}. Only '2' and '3' are supported`,
+  );
+}
+const USE_VUE3 = EXPLICIT_VUE_VERSION === '3';
+
+if (USE_VUE3) {
+  console.log('[V] Using Vue.js 3');
+}
+const VUE_LOADER_MODULE = USE_VUE3 ? 'vue-loader-vue3' : 'vue-loader';
+
 const fs = require('fs');
 const path = require('path');
 
@@ -12,11 +25,13 @@ const BABEL_LOADER_VERSION = require('babel-loader/package.json').version;
 const CompressionPlugin = require('compression-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const glob = require('glob');
-const VueLoaderPlugin = require('vue-loader/lib/plugin');
-const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
+// eslint-disable-next-line import/no-dynamic-require
+const { VueLoaderPlugin } = require(VUE_LOADER_MODULE);
+// eslint-disable-next-line import/no-dynamic-require
+const VUE_LOADER_VERSION = require(`${VUE_LOADER_MODULE}/package.json`).version;
 const VUE_VERSION = require('vue/package.json').version;
 
-const { ESBuildMinifyPlugin } = require('esbuild-loader');
+const { EsbuildPlugin } = require('esbuild-loader');
 
 const webpack = require('webpack');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
@@ -167,6 +182,7 @@ function generateEntries() {
     sandboxed_mermaid: './lib/mermaid.js',
     redirect_listbox: './entrypoints/behaviors/redirect_listbox.js',
     sandboxed_swagger: './lib/swagger.js',
+    super_sidebar: './entrypoints/super_sidebar.js',
   };
 
   return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries));
@@ -282,6 +298,47 @@ if (WEBPACK_USE_ESBUILD_LOADER) {
   console.log('esbuild-loader is active');
 }
 
+const vueLoaderOptions = {
+  ident: 'vue-loader-options',
+
+  cacheDirectory: path.join(CACHE_PATH, 'vue-loader'),
+  cacheIdentifier: [
+    process.env.NODE_ENV || 'development',
+    webpack.version,
+    VUE_VERSION,
+    VUE_LOADER_VERSION,
+    EXPLICIT_VUE_VERSION,
+  ].join('|'),
+};
+
+let shouldExcludeFromCompliling = (modulePath) =>
+  /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath);
+// We explicitly set VUE_VERSION
+// Use @gitlab-ui from source to allow us to dig differences
+// between Vue.js 2 and Vue.js 3 while using built gitlab-ui by default
+if (EXPLICIT_VUE_VERSION) {
+  Object.assign(alias, {
+    '@gitlab/ui/scss_to_js': path.join(ROOT_PATH, 'node_modules/@gitlab/ui/scss_to_js'),
+    '@gitlab/ui/dist': '@gitlab/ui/src',
+    '@gitlab/ui': '@gitlab/ui/src',
+  });
+
+  const originalShouldExcludeFromCompliling = shouldExcludeFromCompliling;
+
+  shouldExcludeFromCompliling = (modulePath) =>
+    originalShouldExcludeFromCompliling(modulePath) &&
+    !/node_modules[\\/]@gitlab[\\/]ui/.test(modulePath) &&
+    !/node_modules[\\/]bootstrap-vue[\\/]src[\\/]vue\.js/.test(modulePath);
+}
+
+if (USE_VUE3) {
+  Object.assign(alias, {
+    vue: '@vue/compat',
+  });
+
+  vueLoaderOptions.compiler = require.resolve('./vue3migration/compiler');
+}
+
 module.exports = {
   mode: IS_PRODUCTION ? 'production' : 'development',
 
@@ -319,17 +376,28 @@ module.exports = {
       },
       WEBPACK_USE_ESBUILD_LOADER && {
         test: /\.(js|cjs)$/,
-        exclude: (modulePath) =>
-          /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath),
+        exclude: shouldExcludeFromCompliling,
         loader: 'esbuild-loader',
         options: esbuildConfiguration,
       },
       !WEBPACK_USE_ESBUILD_LOADER && {
         test: /\.(js|cjs)$/,
-        exclude: (modulePath) =>
-          /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath),
-        loader: 'babel-loader',
-        options: defaultJsOptions,
+        exclude: shouldExcludeFromCompliling,
+        use: [
+          {
+            loader: 'thread-loader',
+            options: {
+              workerParallelJobs: 20,
+              poolRespawn: false,
+              poolParallelJobs: 200,
+              poolTimeout: DEV_SERVER_LIVERELOAD ? Infinity : 5000,
+            },
+          },
+          {
+            loader: 'babel-loader',
+            options: defaultJsOptions,
+          },
+        ],
       },
       WEBPACK_USE_ESBUILD_LOADER && {
         test: /\.(js|cjs)$/,
@@ -354,16 +422,8 @@ module.exports = {
       },
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          cacheDirectory: path.join(CACHE_PATH, 'vue-loader'),
-          cacheIdentifier: [
-            process.env.NODE_ENV || 'development',
-            webpack.version,
-            VUE_VERSION,
-            VUE_LOADER_VERSION,
-          ].join('|'),
-        },
+        loader: VUE_LOADER_MODULE,
+        options: vueLoaderOptions,
       },
       {
         test: /\.(graphql|gql)$/,
@@ -424,7 +484,7 @@ module.exports = {
       {
         test: /.css$/,
         use: [
-          'vue-style-loader',
+          'style-loader',
           {
             loader: 'css-loader',
             options: {
@@ -452,7 +512,6 @@ module.exports = {
         },
       },
       {
-        test: /\.(yml|yaml)$/,
         resourceQuery: /raw/,
         loader: 'raw-loader',
       },
@@ -527,9 +586,7 @@ module.exports = {
         },
       },
     },
-    ...(WEBPACK_USE_ESBUILD_LOADER
-      ? { minimizer: [new ESBuildMinifyPlugin(esbuildConfiguration)] }
-      : {}),
+    ...(WEBPACK_USE_ESBUILD_LOADER ? { minimizer: [new EsbuildPlugin(esbuildConfiguration)] } : {}),
   },
 
   plugins: [