diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 1642187fbce..b2e71fa6e35 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-5b34830d209669e3ffa45b917104474435e0bd90
+323958c43117fc44a76b4fac671a401bbec75833
diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index 5e849b672dc..6c88096caa1 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-ca089de1bada3b8c5470c7b0a5356b02e33a24e8
+e45a2da54ec5766ace4f9c0f5cb25f2b59becba8
diff --git a/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue b/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue
index 22099ef307c..3300153f61a 100644
--- a/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue
+++ b/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue
@@ -80,6 +80,7 @@ export default {
 
     return {
       valueIsVisible: this.initialVisibility,
+      mousetrap: null,
     };
   },
   computed: {
@@ -107,11 +108,11 @@ export default {
     },
   },
   mounted() {
-    this.$options.mousetrap = new Mousetrap(this.$refs.input.$el);
-    this.$options.mousetrap.bind(MOUSETRAP_COPY_KEYBOARD_SHORTCUT, this.handleFormInputCopy);
+    this.mousetrap = new Mousetrap(this.$refs.input.$el);
+    this.mousetrap.bind(MOUSETRAP_COPY_KEYBOARD_SHORTCUT, this.handleFormInputCopy);
   },
   beforeDestroy() {
-    this.$options.mousetrap?.unbind(MOUSETRAP_COPY_KEYBOARD_SHORTCUT);
+    this.mousetrap?.unbind(MOUSETRAP_COPY_KEYBOARD_SHORTCUT);
   },
 
   methods: {
@@ -155,7 +156,6 @@ export default {
       this.$emit('input', newValue);
     },
   },
-  mousetrap: null,
 };
 </script>
 <template>
diff --git a/app/graphql/resolvers/clusters/agents_resolver.rb b/app/graphql/resolvers/clusters/agents_resolver.rb
index 0bcfaded077..4f177144dc6 100644
--- a/app/graphql/resolvers/clusters/agents_resolver.rb
+++ b/app/graphql/resolvers/clusters/agents_resolver.rb
@@ -27,7 +27,7 @@ module Resolvers
 
       def preloads
         {
-          activity_events: { activity_events: [:user, { agent_token: :agent }] },
+          activity_events: { activity_events: [{ user: [:user_detail, :user_preference] }, { agent_token: :agent }] },
           tokens: :active_agent_tokens
         }
       end
diff --git a/config/feature_flags/development/summarize_notes_with_duo.yml b/config/feature_flags/development/summarize_notes_with_duo.yml
deleted file mode 100644
index d0e8dee7144..00000000000
--- a/config/feature_flags/development/summarize_notes_with_duo.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: summarize_notes_with_duo
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156650
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/477886
-milestone: '17.2'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/db/docs/alert_management_alert_metric_images.yml b/db/docs/alert_management_alert_metric_images.yml
index 34626c67a12..8a334455ffe 100644
--- a/db/docs/alert_management_alert_metric_images.yml
+++ b/db/docs/alert_management_alert_metric_images.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: alert_management_alerts
         sharding_key: project_id
         belongs_to: alert
+desired_sharding_key_migration_job_name: BackfillAlertManagementAlertMetricImagesProjectId
diff --git a/db/docs/batched_background_migrations/backfill_alert_management_alert_metric_images_project_id.yml b/db/docs/batched_background_migrations/backfill_alert_management_alert_metric_images_project_id.yml
new file mode 100644
index 00000000000..4126302018b
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_alert_management_alert_metric_images_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillAlertManagementAlertMetricImagesProjectId
+description: Backfills sharding key `alert_management_alert_metric_images.project_id` from `alert_management_alerts`.
+feature_category: incident_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166074
+milestone: '17.5'
+queued_migration_version: 20240915140444
+finalize_after: '2024-10-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/fork_networks.yml b/db/docs/fork_networks.yml
index 0977b27d182..870d2b161a4 100644
--- a/db/docs/fork_networks.yml
+++ b/db/docs/fork_networks.yml
@@ -10,4 +10,4 @@ description: When a project is first forked, a row is created in this table. Als
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3098
 milestone: '10.1'
 gitlab_schema: gitlab_main_cell
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490480
diff --git a/db/docs/lfs_object_states.yml b/db/docs/lfs_object_states.yml
index 2b258b31b70..01c43dae9cd 100644
--- a/db/docs/lfs_object_states.yml
+++ b/db/docs/lfs_object_states.yml
@@ -8,4 +8,4 @@ description: Geo verification states for LFS objects
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63981
 milestone: '14.6'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490481
diff --git a/db/docs/lfs_objects.yml b/db/docs/lfs_objects.yml
index 892f95cc837..76aaacb1bd2 100644
--- a/db/docs/lfs_objects.yml
+++ b/db/docs/lfs_objects.yml
@@ -8,4 +8,4 @@ description: LFS files
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1727
 milestone: '8.2'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490482
diff --git a/db/docs/pool_repositories.yml b/db/docs/pool_repositories.yml
index ee7fae83d67..471d7fc9135 100644
--- a/db/docs/pool_repositories.yml
+++ b/db/docs/pool_repositories.yml
@@ -9,4 +9,4 @@ description: Holds information about a repository storing objects which are
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/fff7754186202cfcdeaa0962c28e5d43ddd705b7
 milestone: '11.6'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490484
diff --git a/db/docs/protected_branch_merge_access_levels.yml b/db/docs/protected_branch_merge_access_levels.yml
index cae623a9ee1..a16ddd6aba0 100644
--- a/db/docs/protected_branch_merge_access_levels.yml
+++ b/db/docs/protected_branch_merge_access_levels.yml
@@ -8,4 +8,4 @@ description: Stores merge access settings for protected branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
 milestone: '8.11'
 gitlab_schema: gitlab_main_cell
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490485
diff --git a/db/docs/protected_branch_push_access_levels.yml b/db/docs/protected_branch_push_access_levels.yml
index 654ee329bea..df59cd2025e 100644
--- a/db/docs/protected_branch_push_access_levels.yml
+++ b/db/docs/protected_branch_push_access_levels.yml
@@ -8,4 +8,4 @@ description: Stores push access settings for protected branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
 milestone: '8.11'
 gitlab_schema: gitlab_main_cell
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490486
diff --git a/db/docs/protected_branch_unprotect_access_levels.yml b/db/docs/protected_branch_unprotect_access_levels.yml
index 3b596b7e592..71eeb0ad8ba 100644
--- a/db/docs/protected_branch_unprotect_access_levels.yml
+++ b/db/docs/protected_branch_unprotect_access_levels.yml
@@ -10,4 +10,4 @@ milestone: '10.7'
 gitlab_schema: gitlab_main_cell
 allow_cross_foreign_keys:
 - gitlab_main_clusterwide
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490487
diff --git a/db/docs/push_rules.yml b/db/docs/push_rules.yml
index 10e2586fe05..112defaa237 100644
--- a/db/docs/push_rules.yml
+++ b/db/docs/push_rules.yml
@@ -8,4 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1b98b5ab97ce3e9997df542059cbf3c6ce0bf0e1
 milestone: '8.10'
 gitlab_schema: gitlab_main_cell
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490488
diff --git a/db/docs/required_code_owners_sections.yml b/db/docs/required_code_owners_sections.yml
index 608b106d8e2..b5610310ed1 100644
--- a/db/docs/required_code_owners_sections.yml
+++ b/db/docs/required_code_owners_sections.yml
@@ -8,4 +8,4 @@ description: Keeps required code owners sections
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43573
 milestone: '13.5'
 gitlab_schema: gitlab_main_cell
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490489
diff --git a/db/docs/snippet_repositories.yml b/db/docs/snippet_repositories.yml
index 3495aa790bb..be0da738397 100644
--- a/db/docs/snippet_repositories.yml
+++ b/db/docs/snippet_repositories.yml
@@ -8,4 +8,4 @@ description: Stores repository information used to version control snippets.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23796
 milestone: '12.8'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490490
diff --git a/db/docs/snippet_repository_storage_moves.yml b/db/docs/snippet_repository_storage_moves.yml
index e20787ba7f1..35d0ef12623 100644
--- a/db/docs/snippet_repository_storage_moves.yml
+++ b/db/docs/snippet_repository_storage_moves.yml
@@ -8,4 +8,4 @@ description: Keeps track of snippet repositories being moved across storages.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45990
 milestone: '13.6'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490491
diff --git a/db/docs/snippet_statistics.yml b/db/docs/snippet_statistics.yml
index d77d9741378..b3a542a2a89 100644
--- a/db/docs/snippet_statistics.yml
+++ b/db/docs/snippet_statistics.yml
@@ -9,4 +9,4 @@ description: Stores the repository size, commit count, and file count regarding
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35026
 milestone: '13.2'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490492
diff --git a/db/docs/snippet_user_mentions.yml b/db/docs/snippet_user_mentions.yml
index a2380bce672..24a0d837aa4 100644
--- a/db/docs/snippet_user_mentions.yml
+++ b/db/docs/snippet_user_mentions.yml
@@ -9,4 +9,4 @@ description: For storing mentioned users, groups, projects referenced in a snipp
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19009
 milestone: '12.6'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490493
diff --git a/db/docs/x509_certificates.yml b/db/docs/x509_certificates.yml
index 7160ed85576..29e016df4a8 100644
--- a/db/docs/x509_certificates.yml
+++ b/db/docs/x509_certificates.yml
@@ -8,4 +8,4 @@ description: Stores data about X.509 certificate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
 milestone: '12.8'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490494
diff --git a/db/docs/x509_issuers.yml b/db/docs/x509_issuers.yml
index d872c3541b2..4d074efa11b 100644
--- a/db/docs/x509_issuers.yml
+++ b/db/docs/x509_issuers.yml
@@ -8,4 +8,4 @@ description: Stores data about issuer of X.509 certificate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
 milestone: '12.8'
 gitlab_schema: gitlab_main
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462136
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490496
diff --git a/db/migrate/20240915140440_add_project_id_to_alert_management_alert_metric_images.rb b/db/migrate/20240915140440_add_project_id_to_alert_management_alert_metric_images.rb
new file mode 100644
index 00000000000..1939e53f5e8
--- /dev/null
+++ b/db/migrate/20240915140440_add_project_id_to_alert_management_alert_metric_images.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToAlertManagementAlertMetricImages < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    add_column :alert_management_alert_metric_images, :project_id, :bigint
+  end
+end
diff --git a/db/post_migrate/20240915140441_index_alert_management_alert_metric_images_on_project_id.rb b/db/post_migrate/20240915140441_index_alert_management_alert_metric_images_on_project_id.rb
new file mode 100644
index 00000000000..d449d0430d1
--- /dev/null
+++ b/db/post_migrate/20240915140441_index_alert_management_alert_metric_images_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexAlertManagementAlertMetricImagesOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_alert_management_alert_metric_images_on_project_id'
+
+  def up
+    add_concurrent_index :alert_management_alert_metric_images, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :alert_management_alert_metric_images, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240915140442_add_alert_management_alert_metric_images_project_id_fk.rb b/db/post_migrate/20240915140442_add_alert_management_alert_metric_images_project_id_fk.rb
new file mode 100644
index 00000000000..8bea1fa516a
--- /dev/null
+++ b/db/post_migrate/20240915140442_add_alert_management_alert_metric_images_project_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddAlertManagementAlertMetricImagesProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :alert_management_alert_metric_images, :projects, column: :project_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :alert_management_alert_metric_images, column: :project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240915140443_add_alert_management_alert_metric_images_project_id_trigger.rb b/db/post_migrate/20240915140443_add_alert_management_alert_metric_images_project_id_trigger.rb
new file mode 100644
index 00000000000..3207d9d08d0
--- /dev/null
+++ b/db/post_migrate/20240915140443_add_alert_management_alert_metric_images_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddAlertManagementAlertMetricImagesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :alert_management_alert_metric_images,
+      sharding_key: :project_id,
+      parent_table: :alert_management_alerts,
+      parent_sharding_key: :project_id,
+      foreign_key: :alert_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :alert_management_alert_metric_images,
+      sharding_key: :project_id,
+      parent_table: :alert_management_alerts,
+      parent_sharding_key: :project_id,
+      foreign_key: :alert_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240915140444_queue_backfill_alert_management_alert_metric_images_project_id.rb b/db/post_migrate/20240915140444_queue_backfill_alert_management_alert_metric_images_project_id.rb
new file mode 100644
index 00000000000..b8fb8c3a920
--- /dev/null
+++ b/db/post_migrate/20240915140444_queue_backfill_alert_management_alert_metric_images_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillAlertManagementAlertMetricImagesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillAlertManagementAlertMetricImagesProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :alert_management_alert_metric_images,
+      :id,
+      :project_id,
+      :alert_management_alerts,
+      :project_id,
+      :alert_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :alert_management_alert_metric_images,
+      :id,
+      [
+        :project_id,
+        :alert_management_alerts,
+        :project_id,
+        :alert_id
+      ]
+    )
+  end
+end
diff --git a/db/schema_migrations/20240915140440 b/db/schema_migrations/20240915140440
new file mode 100644
index 00000000000..f21eee3d884
--- /dev/null
+++ b/db/schema_migrations/20240915140440
@@ -0,0 +1 @@
+f7e8f6a537719bd2f53501406daed6729317c2374d36a892381fc0856131c7f1
\ No newline at end of file
diff --git a/db/schema_migrations/20240915140441 b/db/schema_migrations/20240915140441
new file mode 100644
index 00000000000..6599df34bc0
--- /dev/null
+++ b/db/schema_migrations/20240915140441
@@ -0,0 +1 @@
+14c9ab00978c00a7081a37ff941fcffaebc67f54c917a60f5157c3f3c2e885a7
\ No newline at end of file
diff --git a/db/schema_migrations/20240915140442 b/db/schema_migrations/20240915140442
new file mode 100644
index 00000000000..3c074bf6e39
--- /dev/null
+++ b/db/schema_migrations/20240915140442
@@ -0,0 +1 @@
+3099ae5784b9647222c5ca82ad37a6aadf027ae84d0e0aae91ff1180b23e164f
\ No newline at end of file
diff --git a/db/schema_migrations/20240915140443 b/db/schema_migrations/20240915140443
new file mode 100644
index 00000000000..9bb8e35dd38
--- /dev/null
+++ b/db/schema_migrations/20240915140443
@@ -0,0 +1 @@
+26e65032cadb1549baef1ecbde655d776034854f8ba3048033399eac48015ab0
\ No newline at end of file
diff --git a/db/schema_migrations/20240915140444 b/db/schema_migrations/20240915140444
new file mode 100644
index 00000000000..fa1a0426590
--- /dev/null
+++ b/db/schema_migrations/20240915140444
@@ -0,0 +1 @@
+322c89fee81174ca629115be3584567666c6f58405bc4a8dd12917c170463ba1
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 71da08ebf05..f2633fe2cd2 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2169,6 +2169,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_ec1934755627() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."project_id"
+  FROM "alert_management_alerts"
+  WHERE "alert_management_alerts"."id" = NEW."alert_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_f6c61cdddf31() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -5210,6 +5226,7 @@ CREATE TABLE alert_management_alert_metric_images (
     file text NOT NULL,
     url text,
     url_text text,
+    project_id bigint,
     CONSTRAINT check_2587666252 CHECK ((char_length(url_text) <= 128)),
     CONSTRAINT check_4d811d9007 CHECK ((char_length(url) <= 255)),
     CONSTRAINT check_70fafae519 CHECK ((char_length(file) <= 255))
@@ -27069,6 +27086,8 @@ CREATE INDEX index_alert_management_alert_assignees_on_project_id ON alert_manag
 
 CREATE INDEX index_alert_management_alert_metric_images_on_alert_id ON alert_management_alert_metric_images USING btree (alert_id);
 
+CREATE INDEX index_alert_management_alert_metric_images_on_project_id ON alert_management_alert_metric_images USING btree (project_id);
+
 CREATE INDEX index_alert_management_alerts_on_domain ON alert_management_alerts USING btree (domain);
 
 CREATE INDEX index_alert_management_alerts_on_environment_id ON alert_management_alerts USING btree (environment_id) WHERE (environment_id IS NOT NULL);
@@ -33105,6 +33124,8 @@ CREATE TRIGGER trigger_e49ab4d904a0 BEFORE INSERT OR UPDATE ON vulnerability_fin
 
 CREATE TRIGGER trigger_ebab34f83f1d BEFORE INSERT OR UPDATE ON packages_debian_publications FOR EACH ROW EXECUTE FUNCTION trigger_ebab34f83f1d();
 
+CREATE TRIGGER trigger_ec1934755627 BEFORE INSERT OR UPDATE ON alert_management_alert_metric_images FOR EACH ROW EXECUTE FUNCTION trigger_ec1934755627();
+
 CREATE TRIGGER trigger_f6c61cdddf31 BEFORE INSERT OR UPDATE ON ml_model_metadata FOR EACH ROW EXECUTE FUNCTION trigger_f6c61cdddf31();
 
 CREATE TRIGGER trigger_f6f59d8216b3 BEFORE INSERT OR UPDATE ON protected_environment_deploy_access_levels FOR EACH ROW EXECUTE FUNCTION trigger_f6f59d8216b3();
@@ -33908,6 +33929,9 @@ ALTER TABLE ONLY packages_debian_project_components
 ALTER TABLE ONLY sprints
     ADD CONSTRAINT fk_80aa8a1f95 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY alert_management_alert_metric_images
+    ADD CONSTRAINT fk_80b75a6094 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY related_epic_links
     ADD CONSTRAINT fk_8257080565 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md
index 52085e5b471..08a3f7a21ed 100644
--- a/doc/development/fe_guide/style/scss.md
+++ b/doc/development/fe_guide/style/scss.md
@@ -183,11 +183,69 @@ Inspiration:
 - <https://tailwindcss.com/docs/utility-first>
 - <https://tailwindcss.com/docs/extracting-components>
 
-### Leveraging Tailwind CSS in stylesheets
+### Leveraging Tailwind CSS in HTML and in stylesheets
 
-When writing custom SCSS, you may want to inherit style definitions from the design system without
-needing to figure out the relevant properties or values. To simplify this process, you can use
-Tailwind CSS's [`@apply` directive](https://tailwindcss.com/docs/reusing-styles#extracting-classes-with-apply)
+When writing component classes, it's important to effectively integrate Tailwind CSS's utility classes to
+maintain consistency with the design system and keeping the CSS bundles small.
+
+**Utility CSS Classes in HTML vs. in stylesheets:**
+
+By using the utility classes directly in the HTML, we can keep the CSS file size smaller and adhere
+to the utility-first philosophy. By avoiding to combine utility classes with custom styles in one components class
+unless absolutely necessary, we can prevent confusion and potential conflicts.
+
+- **Reasons for the Preference:**
+  - **Smaller CSS File Size:** Utilizing utility classes directly can lead to more compact CSS files and
+  promote a more consistent design system.
+  - **Clarity and Maintainability:** When utility classes are used in HTML, it's clearer how styles are
+  applied, reducing the risk of conflicts and regressions.
+
+- **Potential Issues with Combining Styles:**
+  - **Conflicts:** If utility classes and custom styles are combined in a single class, conflicts can arise,
+  especially when the styles have interdependencies.
+  - **Regressions:** It becomes less obvious how styles should resolve, leading to possible regressions
+  or unexpected behavior.
+
+By following these guidelines, we can create clean, maintainable stylesheets that leverage Tailwind CSS effectively.
+
+#### 1. Use utility classes directly in HTML (preferred approach)
+
+For better maintainability and to adhere to the utility-first principle, add utility classes directly
+to the HTML element. A component class should primarily contain only the non-utility CSS styles.
+In the following example, you add the utility classes `gl-fixed` and `gl-inset-x-0`, instead of adding
+`position: fixed; right: 0; left: 0;` to the SCSS file:
+
+```html
+<!-- Bad -->
+<div class="my-class"></div>
+
+<style>
+  .my-class {
+    top: $header-height;
+    z-index: 999;
+    position: fixed;
+    left: 0px;
+    right: 0px;
+ }
+</style>
+
+<!-- Good -->
+<div class="my-class gl-fixed gl-inset-x-0"></div>
+
+<style>
+  .my-class {
+    top: $header-height;
+    z-index: 999;
+  }
+</style>
+```
+
+#### 2. Apply utility classes in component classes (when necessary)
+
+Sometime it might not feasible to use utility classes directly in HTML and you need to include them in our
+custom SCSS files. Then, you might want to inherit style definitions from the design system without needing to figure
+out the relevant properties or values. To simplify this process, you can use Tailwind CSS's
+[`@apply` directive](https://tailwindcss.com/docs/reusing-styles#extracting-classes-with-apply)
 to include utilities' style definitions in your custom styles.
 
 Using `@apply` is _encouraged_ for applying CSS properties that depend on the design system (e.g. `margin`, `padding`).
diff --git a/doc/development/sidekiq/limited_capacity_worker.md b/doc/development/sidekiq/limited_capacity_worker.md
index 51e8adeec39..e76982329b3 100644
--- a/doc/development/sidekiq/limited_capacity_worker.md
+++ b/doc/development/sidekiq/limited_capacity_worker.md
@@ -4,14 +4,15 @@ group: unassigned
 info: Any user with at least the Maintainer role can merge updates to this content. For details, see https://docs.gitlab.com/ee/development/development_processes.html#development-guidelines-review.
 ---
 
+# Sidekiq limited capacity worker
+
+NOTE:
 The following documentation for limited capacity worker relates to a specific
 type of worker that usually does not take arguments but instead gets work from
 a custom queue (e.g. a PostgresSQL backlog of work). It cannot be used for
 throttling normal Sidekiq workers. To restrict the concurrency of a normal
 Sidekiq worker you can use a [concurrency limit](worker_attributes.md#concurrency-limit).
 
-# Sidekiq limited capacity worker
-
 It is possible to limit the number of concurrent running jobs for a worker class
 by using the `LimitedCapacity::Worker` concern.
 
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index e316d0a88e9..89548e08540 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -325,11 +325,6 @@ DETAILS:
 > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/454550) to GitLab Duo and promoted to [beta](../../policy/experiment-beta-support.md#beta) in GitLab 17.3 [with a flag](../../administration/feature_flags.md) named `summarize_notes_with_duo`. Disabled by default.
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162122) in GitLab 17.4.
 
-FLAG:
-The availability of this feature is controlled by a feature flag.
-For more information, see the history.
-This feature is available for testing, but not ready for production use.
-
 Generate a summary of discussions on an issue.
 
 Prerequisites:
diff --git a/lib/gitlab/background_migration/backfill_alert_management_alert_metric_images_project_id.rb b/lib/gitlab/background_migration/backfill_alert_management_alert_metric_images_project_id.rb
new file mode 100644
index 00000000000..c010ac9b3d1
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_alert_management_alert_metric_images_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillAlertManagementAlertMetricImagesProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_alert_management_alert_metric_images_project_id
+      feature_category :incident_management
+    end
+  end
+end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 097e464f190..583933e4155 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -55566,9 +55566,6 @@ msgstr ""
 msgid "This epic does not exist or you don't have sufficient permission."
 msgstr ""
 
-msgid "This feature is not enabled yet."
-msgstr ""
-
 msgid "This feature requires local storage to be enabled"
 msgstr ""
 
diff --git a/spec/frontend/access_tokens/components/new_access_token_app_spec.js b/spec/frontend/access_tokens/components/new_access_token_app_spec.js
index 23a092cedd1..97229f11c50 100644
--- a/spec/frontend/access_tokens/components/new_access_token_app_spec.js
+++ b/spec/frontend/access_tokens/components/new_access_token_app_spec.js
@@ -1,7 +1,7 @@
 import { GlAlert } from '@gitlab/ui';
 import { nextTick } from 'vue';
 import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
-import { mountExtended } from 'helpers/vue_test_utils_helper';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import NewAccessTokenApp from '~/access_tokens/components/new_access_token_app.vue';
 import { EVENT_ERROR, EVENT_SUCCESS, FORM_SELECTOR } from '~/access_tokens/components/constants';
 import { createAlert, VARIANT_INFO } from '~/alert';
@@ -17,7 +17,7 @@ describe('~/access_tokens/components/new_access_token_app', () => {
   const accessTokenType = 'personal access token';
 
   const createComponent = (provide = { accessTokenType }) => {
-    wrapper = mountExtended(NewAccessTokenApp, {
+    wrapper = shallowMountExtended(NewAccessTokenApp, {
       provide,
     });
   };
diff --git a/spec/frontend/access_tokens/components/token_spec.js b/spec/frontend/access_tokens/components/token_spec.js
index ad92366c3b6..84954194b79 100644
--- a/spec/frontend/access_tokens/components/token_spec.js
+++ b/spec/frontend/access_tokens/components/token_spec.js
@@ -1,4 +1,4 @@
-import { mountExtended } from 'helpers/vue_test_utils_helper';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 
 import Token from '~/access_tokens/components/token.vue';
 import InputCopyToggleVisibility from '~/vue_shared/components/form/input_copy_toggle_visibility.vue';
@@ -20,7 +20,7 @@ describe('Token', () => {
   };
 
   const createComponent = () => {
-    wrapper = mountExtended(Token, { propsData: defaultPropsData, slots: defaultSlots });
+    wrapper = shallowMountExtended(Token, { propsData: defaultPropsData, slots: defaultSlots });
   };
 
   it('renders title slot', () => {
diff --git a/spec/frontend/vue_shared/components/form/input_copy_toggle_visibility_spec.js b/spec/frontend/vue_shared/components/form/input_copy_toggle_visibility_spec.js
index 5e7520b37c3..9da7604410c 100644
--- a/spec/frontend/vue_shared/components/form/input_copy_toggle_visibility_spec.js
+++ b/spec/frontend/vue_shared/components/form/input_copy_toggle_visibility_spec.js
@@ -40,7 +40,7 @@ describe('InputCopyToggleVisibility', () => {
     return event;
   };
   const triggerCopyShortcut = () => {
-    wrapper.vm.$options.mousetrap.trigger(MOUSETRAP_COPY_KEYBOARD_SHORTCUT);
+    wrapper.vm.mousetrap.trigger(MOUSETRAP_COPY_KEYBOARD_SHORTCUT);
   };
 
   function expectInputToBeMasked() {
diff --git a/spec/lib/gitlab/background_migration/backfill_alert_management_alert_metric_images_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_alert_management_alert_metric_images_project_id_spec.rb
new file mode 100644
index 00000000000..04ff0844d2a
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_alert_management_alert_metric_images_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillAlertManagementAlertMetricImagesProjectId,
+  feature_category: :incident_management,
+  schema: 20240915140440 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :alert_management_alert_metric_images }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :alert_management_alerts }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :alert_id }
+  end
+end
diff --git a/spec/migrations/20240915140444_queue_backfill_alert_management_alert_metric_images_project_id_spec.rb b/spec/migrations/20240915140444_queue_backfill_alert_management_alert_metric_images_project_id_spec.rb
new file mode 100644
index 00000000000..3651055abff
--- /dev/null
+++ b/spec/migrations/20240915140444_queue_backfill_alert_management_alert_metric_images_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillAlertManagementAlertMetricImagesProjectId, feature_category: :incident_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :alert_management_alert_metric_images,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :project_id,
+            :alert_management_alerts,
+            :project_id,
+            :alert_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/project/cluster_agents_spec.rb b/spec/requests/api/graphql/project/cluster_agents_spec.rb
index 338052d2a9e..0e182b97af2 100644
--- a/spec/requests/api/graphql/project/cluster_agents_spec.rb
+++ b/spec/requests/api/graphql/project/cluster_agents_spec.rb
@@ -128,7 +128,7 @@ RSpec.describe 'Project.cluster_agents', feature_category: :deployment_managemen
       })
     end
 
-    it 'preloads associations to prevent N+1 queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350868' do
+    it 'preloads associations to prevent N+1 queries' do
       user = create(:user)
       token = create(:cluster_agent_token, agent: agents.second)
       create(:agent_activity_event, agent: agents.second, agent_token: token, user: user)